From 2ebe03ab4042d2962e63e3d4f9a7bc714452e173 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Wed, 15 Jan 2014 09:30:34 +0100 Subject: Port this code to work with Qt5 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 Signed-off-by: Dirk Hohndel --- qt-ui/subsurfacewebservices.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index 6a94393f5..583000ff0 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -22,6 +22,10 @@ # include // for dup(2) #endif +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) +# include +#endif + struct dive_table gps_location_table; static bool merge_locations_into_dives(void); @@ -369,7 +373,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); -- cgit v1.2.3-70-g09d2