[qlandkartegt] 01/01: Switch from Qt4 to Qt5.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qlandkartegt.

commit b883c373b68e22cf68d09ff31c2cc4c26457865d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 3 14:41:28 2015 +0200

    Switch from Qt4 to Qt5.
---
 debian/changelog         |  6 ++++++
 debian/control           | 12 ++++++++---
 debian/patches/qt5.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series    |  1 +
 debian/rules             |  1 +
 5 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ccb27ce..1855a28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qlandkartegt (1.8.1+ds-2) UNRELEASED; urgency=medium
+
+  * Switch from Qt4 to Qt5.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 May 2015 14:41:04 +0200
+
 qlandkartegt (1.8.1+ds-1) unstable; urgency=medium
 
   * Set the date embedded in man pages to the changelog date for
diff --git a/debian/control b/debian/control
index c19446e..66ecac8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,15 @@ Build-Depends: cmake,
                libgdal-dev (>= 1.10.1-0~),
                libgps-dev,
                libproj-dev,
-               libqt4-dev,
-               libqt4-opengl-dev,
-               libqtwebkit-dev,
+               libqt5opengl5-dev,
+               libqt5serialport5-dev,
+               libqt5webkit5-dev,
+               qtbase5-dev,
+               qtdeclarative5-dev,
+               qtmultimedia5-dev,
+               qtscript5-dev,
+               qttools5-dev,
+               qttools5-dev-tools,
                docbook2x,
                docbook-xsl,
                docbook-xml,
diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
new file mode 100644
index 0000000..3d700ae
--- /dev/null
+++ b/debian/patches/qt5.patch
@@ -0,0 +1,55 @@
+Description: Update for Qt5
+ QString::toAscii() replaced by QString::toLatin1()
+ QUrl.setEncodedQueryItems() replaced by QUrl.setQuery(QUrlQuery.setQueryItems())
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/src/CDlgEditWpt.cpp
++++ b/src/CDlgEditWpt.cpp
+@@ -532,7 +532,7 @@ void CDlgEditWpt::slotUpdateBarcode()
+         {
+             barcode = barcode.left(177) + "...";
+         }
+-        dmtxEncodeDataMatrix( enc, barcode.size(), (unsigned char*)barcode.toAscii().data() );
++        dmtxEncodeDataMatrix( enc, barcode.size(), (unsigned char*)barcode.toLatin1().data() );
+ 
+         QImage curBarCode( enc->image->pxl, enc->image->width, enc->image->height, QImage::Format_RGB32 );
+         labelBarcode->setPixmap(QPixmap::fromImage(curBarCode));
+--- a/src/CRouteToolWidget.cpp
++++ b/src/CRouteToolWidget.cpp
+@@ -1016,13 +1016,25 @@ void CRouteToolWidget::startBRouterServi
+         }
+     }
+ 
++#ifdef QK_QT5_PORT
++    QList< QPair<QString, QString> > queryItems;
++    queryItems << QPair<QString, QString>("lonlats",lonlats.toLatin1());
++    queryItems << QPair<QString, QString>("nogos", "");
++    queryItems << QPair<QString, QString>("profile", comboBRPreference->itemData(comboBRPreference->currentIndex()).toString());
++    queryItems << QPair<QString, QString>("alternativeidx", QString::number(rte.getRouteIdx()));
++    queryItems << QPair<QString, QString>("format", "gpx");
++    QUrlQuery urlQuery;
++    urlQuery.setQueryItems(queryItems);
++    url.setQuery(urlQuery);
++#else
+     QList< QPair<QByteArray, QByteArray> > queryItems;
+-    queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toAscii()));
++    queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toLatin1()));
+     queryItems << QPair<QByteArray, QByteArray>(QByteArray("nogos"), QByteArray(""));
+     queryItems << QPair<QByteArray, QByteArray>(QByteArray("profile"), comboBRPreference->itemData(comboBRPreference->currentIndex()).toByteArray());
+     queryItems << QPair<QByteArray, QByteArray>(QByteArray("alternativeidx"), QVariant(rte.getRouteIdx()).toByteArray());
+     queryItems << QPair<QByteArray, QByteArray>(QByteArray("format"), QByteArray("gpx"));
+     url.setEncodedQueryItems(queryItems);
++#endif
+ 
+     QNetworkRequest request;
+ 
+--- a/src/CExchangeGarmin.cpp
++++ b/src/CExchangeGarmin.cpp
+@@ -21,6 +21,7 @@
+ #include <QtDBus>
+ #include <QtXml>
+ #include <QtGui>
++#include <QMessageBox>
+ 
+ CGarminTreeWidgetItem::CGarminTreeWidgetItem(const QString& id, QTreeWidget *parent)
+     : IDeviceTreeWidgetItem(id,parent)
diff --git a/debian/patches/series b/debian/patches/series
index d05ae88..5237163 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03-set_user_agent.patch
 04-qlandkartegt-desktop-exec.patch
 05-https-osm-tiles.patch
+qt5.patch
diff --git a/debian/rules b/debian/rules
index cd304ad..87317c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ overrid_dh_clean:
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DGPX_EXTENSIONS:BOOL=TRUE \
+	                     -DQK_QT5_PORT=1 \
 	                     -DCMAKE_VERBOSE_MAKEFILE=1
 
 override_dh_auto_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qlandkartegt.git