Updater: Rudimentary support for beta channel

So we can get people update from our alpha to the beta and rc

diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp
index 8294bb4be92e3102ee33557e089c7c6256f3114c..940f2026b7b7ca6934c65d145e592bc11f12f4d5 100644 (file)
--- a/src/gui/updater/updater.cpp
+++ b/src/gui/updater/updater.cpp
@@ -61,6 +61,18 @@ QUrl Updater::addQueryParams(const QUrl &url)
     paramUrl.addQueryItem(QLatin1String("version"), clientVersion());
     paramUrl.addQueryItem(QLatin1String("platform"), platform);
     paramUrl.addQueryItem(QLatin1String("oem"), theme->appName());
+
+    QString suffix = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
+    paramUrl.addQueryItem(QLatin1String("versionsuffix"), suffix);
+    if (suffix.startsWith("nightly")
+            || suffix.startsWith("alpha")
+            || suffix.startsWith("rc")
+            || suffix.startsWith("beta")) {
+        paramUrl.addQueryItem(QLatin1String("channel"), "beta");
+        // FIXME: Provide a checkbox in UI to enable regular versions to switch
+        // to beta channel
+    }
+
     return paramUrl;
 }
 

diff --git a/version.h.in b/version.h.in
index 064309f529f3cf64b6de9e46a38ef68f2ea5a128..e96ba1fe0565a98e93cc6e9f826f09f1763ea5a3 100644 (file)
--- a/version.h.in
+++ b/version.h.in
@@ -30,6 +30,8 @@
 #define MIRALL_VERSION_PATCH @MIRALL_VERSION_PATCH@
 #define MIRALL_VERSION_BUILD @MIRALL_VERSION_BUILD@
 
+#define MIRALL_VERSION_SUFFIX @MIRALL_VERSION_SUFFIX@
+
 #define MIRALL_VERSION       @MIRALL_VERSION@
 #define MIRALL_VERSION_FULL  @MIRALL_VERSION_FULL@