jlec 15/02/10 10:46:10
Added: qlandkartegt-1.8.0-deprecated.patch
qlandkartegt-1.8.0-includes.patch
Log:
Version Bump; add QT5 support
(Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.1
sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch?rev=1.1&content-type=text/plain
Index: qlandkartegt-1.8.0-deprecated.patch
===================================================================
diff --git a/src/CRouteToolWidget.cpp b/src/CRouteToolWidget.cpp
index 659d193..ebd4208 100644
--- a/src/CRouteToolWidget.cpp
+++ b/src/CRouteToolWidget.cpp
@@ -1015,14 +1015,25 @@ void CRouteToolWidget::startBRouterService(CRoute& rte)
isNext = true;
}
}
-
+#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()).toByteArray());
+ queryItems << QPair<QString, QString>("alternativeidx",
QVariant(rte.getRouteIdx()).toByteArray());
+ 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;
1.1
sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch?rev=1.1&content-type=text/plain
Index: qlandkartegt-1.8.0-includes.patch
===================================================================
diff --git a/src/CExchangeGarmin.cpp b/src/CExchangeGarmin.cpp
index 1d0a118..236e4ad 100644
--- 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)
