mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-31 21:43:23 +00:00
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 <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
1363e28f8b
commit
2ebe03ab40
1 changed files with 10 additions and 0 deletions
|
@ -22,6 +22,10 @@
|
||||||
# include <unistd.h> // for dup(2)
|
# include <unistd.h> // for dup(2)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
|
||||||
|
# include <QUrlQuery>
|
||||||
|
#endif
|
||||||
|
|
||||||
struct dive_table gps_location_table;
|
struct dive_table gps_location_table;
|
||||||
static bool merge_locations_into_dives(void);
|
static bool merge_locations_into_dives(void);
|
||||||
|
|
||||||
|
@ -369,7 +373,13 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton* button)
|
||||||
void SubsurfaceWebServices::startDownload()
|
void SubsurfaceWebServices::startDownload()
|
||||||
{
|
{
|
||||||
QUrl url("http://api.hohndel.org/api/dive/get/");
|
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());
|
url.addQueryItem("login", ui.userID->text().toUpper());
|
||||||
|
#else
|
||||||
|
QUrlQuery query;
|
||||||
|
query.addQueryItem("login", ui.userID->text().toUpper());
|
||||||
|
url.setQuery(query);
|
||||||
|
#endif
|
||||||
|
|
||||||
QNetworkRequest request;
|
QNetworkRequest request;
|
||||||
request.setUrl(url);
|
request.setUrl(url);
|
||||||
|
|
Loading…
Add table
Reference in a new issue