astro/qmapshack: prepare for Qt5-5.15

2020-05-21 11:19:28 +00:00
parent 95c6ffe6e6
commit 3e11abba1b
6 changed files with 61 additions and 0 deletions
--- a/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp
+++ b/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp
@@ -0,0 +1,10 @@
+--- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig	2020-05-21 11:11:11 UTC
+++ src/qmapshack/gis/wpt/CGisItemWpt.cpp
+@@ -38,6 +38,7 @@
+ 
+ #include <QtWidgets>
+ #include <QtXml>
+#include <QPainterPath>
+ 
+ IGisItem::key_t CGisItemWpt::keyUserFocus;
+ QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap;
--- a/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp
+++ b/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp
@@ -0,0 +1,10 @@
+--- src/qmapshack/helpers/CDraw.cpp.orig	2020-05-21 11:11:11 UTC
+++ src/qmapshack/helpers/CDraw.cpp
+@@ -24,6 +24,7 @@
+ #include <QImage>
+ #include <QPointF>
+ #include <QtMath>
+#include <QPainterPath>
+ 
+ QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
+ QPen CDraw::penBorderGray(Qt::lightGray, 2);
--- a/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp
+++ b/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp
@@ -0,0 +1,10 @@
+--- src/qmapshack/map/CMapIMG.cpp.orig	2020-05-21 11:11:11 UTC
+++ src/qmapshack/map/CMapIMG.cpp
+@@ -33,6 +33,7 @@
+ #include "units/IUnit.h"
+ 
+ #include <QtWidgets>
+#include <QPainterPath>
+ 
+ #undef DEBUG_SHOW_SECT_DESC
+ #undef DEBUG_SHOW_TRE_DATA
--- a/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp
+++ b/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp
@@ -0,0 +1,10 @@
+--- src/qmapshack/mouse/IMouseSelect.cpp.orig	2020-05-21 11:11:11 UTC
+++ src/qmapshack/mouse/IMouseSelect.cpp
+@@ -23,6 +23,7 @@
+ #include "mouse/IScrOpt.h"
+ 
+ #include <QtWidgets>
+#include <QPainterPath>
+ 
+ IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse)
+     : IMouse(gis, canvas, mouse)
--- a/astro/qmapshack/files/patch-src_qmaptool_helpers_CDraw.cpp
+++ b/astro/qmapshack/files/patch-src_qmaptool_helpers_CDraw.cpp
@@ -0,0 +1,10 @@
+--- src/qmaptool/helpers/CDraw.cpp.orig	2020-05-21 11:11:11 UTC
+++ src/qmaptool/helpers/CDraw.cpp
+@@ -24,6 +24,7 @@
+ #include <QImage>
+ #include <QPointF>
+ #include <QtMath>
+#include <QPainterPath>
+ 
+ QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
+ QPen CDraw::penBorderGray(Qt::lightGray,2);
--- a/astro/qmapshack/files/patch-src_qmaptool_overlay_COverlayCutMap.cpp
+++ b/astro/qmapshack/files/patch-src_qmaptool_overlay_COverlayCutMap.cpp
@@ -0,0 +1,11 @@
+--- src/qmaptool/overlay/COverlayCutMap.cpp.orig	2020-05-21 11:11:11 UTC
+++ src/qmaptool/overlay/COverlayCutMap.cpp
+@@ -24,6 +24,8 @@
+ 
+ #include <functional>
+ #include <QtWidgets>
+#include <QPainterPath>
+
+ using std::bind;
+ 
+ static inline qreal sqr(qreal a)