[PATCH 03/13] Port this code to work with Qt5
Anton Lundin
glance at acc.umu.se
Wed Jan 15 00:30:34 UTC 2014
This code had parts that where Qt5-compatible, this introduces the last
bits that it needs to be completely compatible.
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
qt-ui/subsurfacewebservices.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index 1789b03..4ba2634 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -22,6 +22,10 @@
# include <unistd.h> // for dup(2)
#endif
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+# include <QUrlQuery>
+#endif
+
struct dive_table gps_location_table;
static bool merge_locations_into_dives(void);
@@ -363,7 +367,13 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton* button)
void SubsurfaceWebServices::startDownload()
{
QUrl url("http://api.hohndel.org/api/dive/get/");
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
url.addQueryItem("login", ui.userID->text().toUpper());
+#else
+ QUrlQuery query;
+ query.addQueryItem("login", ui.userID->text().toUpper());
+ url.setQuery(query);
+#endif
QNetworkRequest request;
request.setUrl(url);
--
1.8.3.2
More information about the subsurface
mailing list