[zygrib] 11/22: Update for Qt5

Alastair McKinstry mckinstry at moszumanska.debian.org
Mon Nov 21 12:59:01 UTC 2016


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/8.0.1-1
in repository zygrib.

commit 959d6d4cb735f4934f99c636953e55a678a2a3e7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Oct 16 15:05:39 2015 +0100

    Update for Qt5
---
 debian/patches/qt5.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index 36ef125..71bbd37 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -366,3 +366,21 @@ Index: zygrib-7.0.0/src/curvedrawer/CustomQwtClasses.cpp
  	: QwtPlotPicker( xAxis, yAxis, rubberBand, trackerMode, canvas )
  {
  	dtCurPos = dtCurrent;
+Index: zygrib-7.0.0/src/map/POI.cpp
+===================================================================
+--- zygrib-7.0.0.orig/src/map/POI.cpp
++++ zygrib-7.0.0/src/map/POI.cpp
+@@ -137,10 +137,10 @@ void POI::readSettings (uint code, bool
+ 	isMovable = Settings::getSettingPOI (code, "move", false, fnat).toBool();
+ 	showLabel = Settings::getSettingPOI (code, "showLabel", true, fnat).toBool();
+ 	setDisplayParams
+-		( Settings::getSettingPOI (code, "markColor", Qt::red, fnat).value<QColor>(),
++		( Settings::getSettingPOI (code, "markColor", QColor(Qt::red), fnat).value<QColor>(),
+ 	      Settings::getSettingPOI (code, "labelFont", Font::getFont(FONT_POILabel), fnat).value<QFont>(),
+-		  Settings::getSettingPOI (code, "labelTextColor", Qt::black, fnat).value<QColor>(),
+-		  Settings::getSettingPOI (code, "labelBgColor", Qt::white, fnat).value<QColor>()
++		  Settings::getSettingPOI (code, "labelTextColor", QColor(Qt::black), fnat).value<QColor>(),
++		  Settings::getSettingPOI (code, "labelBgColor", QColor(Qt::white), fnat).value<QColor>()
+ 		);		
+ }
+ //-------------------------------------------------------------------------------

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/zygrib.git



More information about the debian-science-commits mailing list