Fix macOS updater build without deprecated Qt apis

2 files changed, 14 insertions, 7 deletions

diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp
index 8aff77f6f..868595a42 100644
--- a/src/gui/updater/updater.cpp
+++ b/src/gui/updater/updater.cpp
@@ -13,6 +13,7 @@
  */
 
 #include <QUrl>
+#include <QUrlQuery>
 #include <QProcess>
 
 #include "updater/updater.h"
@@ -39,7 +40,7 @@ Updater *Updater::instance()
     return _instance;
 }
 
-QUrl Updater::addQueryParams(const QUrl &url)
+QUrlQuery Updater::getQueryParams()
 {
     QUrlQuery query;
     Theme *theme = Theme::instance();
@@ -74,9 +75,7 @@ QUrl Updater::addQueryParams(const QUrl &url)
         // to beta channel
     }
 
-    QUrl paramUrl = url;
-    paramUrl.setQuery(query);
-    return paramUrl;
+    return query;
 }
 
 
@@ -108,9 +107,16 @@ Updater *Updater::create()
         qCWarning(lcUpdater) << "Not a valid updater URL, will not do update check";
         return 0;
     }
-    updateBaseUrl = addQueryParams(updateBaseUrl);
+
+    auto urlQuery = getQueryParams();
+
+#if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
+    urlQuery.addQueryItem(QLatin1String("sparkle"), QLatin1String("true"));
+#endif
+
+    updateBaseUrl.setQuery(urlQuery);
+
 #if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
-    updateBaseUrl.addQueryItem(QLatin1String("sparkle"), QLatin1String("true"));
     return new SparkleUpdater(updateBaseUrl.toString());
 #elif defined(Q_OS_WIN32)
     // the best we can do is notify about updates
diff --git a/src/gui/updater/updater.h b/src/gui/updater/updater.h
index 77f322638..04d18ac85 100644
--- a/src/gui/updater/updater.h
+++ b/src/gui/updater/updater.h
@@ -19,6 +19,7 @@
 #include <QObject>
 
 class QUrl;
+class QUrlQuery;
 
 namespace OCC {
 
@@ -50,7 +51,7 @@ protected:
 
 private:
     static QString getSystemInfo();
-    static QUrl addQueryParams(const QUrl &url);
+    static QUrlQuery getQueryParams();
     static Updater *create();
     static Updater *_instance;
 };