No longer try to concatenate defines

Fixes: #8920

5 files changed, 17 insertions, 13 deletions

diff --git a/VERSION.cmake b/VERSION.cmake
index 24a6ccfc3..c2251dd07 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -15,9 +15,7 @@ endif( NOT DEFINED MIRALL_VERSION_BUILD )
 # Used e.g. for libraries Keep at x.y.z.
 set( MIRALL_VERSION "${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH}" )
 # Version with Build ID. Used in the installer
-set( MIRALL_VERSION_FULL ${MIRALL_VERSION} )
-set( MIRALL_VERSION_STRING ${MIRALL_VERSION} )
-set( MIRALL_VERSION_FULL "${MIRALL_VERSION_FULL}.${MIRALL_VERSION_BUILD}" )
+set( MIRALL_VERSION_FULL "${MIRALL_VERSION}.${MIRALL_VERSION_BUILD}" )
 
 set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" )
 
diff --git a/changelog/unreleased/8920 b/changelog/unreleased/8920
new file mode 100644
index 000000000..e5a251904
--- /dev/null
+++ b/changelog/unreleased/8920
@@ -0,0 +1,5 @@
+Bugfix: Broken url in branded builds
+
+We fixed a string issue with branded builds resulting in invalid urls.
+
+https://github.com/owncloud/client/issues/8920
diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp
index 09fdde0d1..59f53e289 100644
--- a/src/gui/updater/updater.cpp
+++ b/src/gui/updater/updater.cpp
@@ -91,8 +91,7 @@ QUrlQuery Updater::getQueryParams()
     query.addQueryItem(QStringLiteral("buildArch"), QSysInfo::buildCpuArchitecture());
     query.addQueryItem(QStringLiteral("currentArch"), QSysInfo::currentCpuArchitecture());
 
-    QString suffix = QStringLiteral(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
-    query.addQueryItem(QStringLiteral("versionsuffix"), suffix);
+    query.addQueryItem(QStringLiteral("versionsuffix"), MIRALL_VERSION_SUFFIX());
 
     auto channel = ConfigFile().updateChannel();
     if (channel != QLatin1String("stable")) {
@@ -165,7 +164,7 @@ qint64 Updater::Helper::stringVersionToInt(const QString &version)
 
 QString Updater::clientVersion()
 {
-    return QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_FULL));
+    return MIRALL_VERSION_FULL();
 }
 
 } // namespace OCC
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 8cd164348..aedc19ddf 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -539,7 +539,7 @@ void ConfigFile::setSkipUpdateCheck(bool skip, const QString &connection)
 QString ConfigFile::updateChannel() const
 {
     QString defaultUpdateChannel = QStringLiteral("stable");
-    QString suffix = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
+    const QString suffix = MIRALL_VERSION_SUFFIX();
     if (suffix.startsWith(QLatin1String("daily"))
         || suffix.startsWith(QLatin1String("nightly"))
         || suffix.startsWith(QLatin1String("alpha"))
diff --git a/version.h.in b/version.h.in
index c29959a75..0a55a011d 100644
--- a/version.h.in
+++ b/version.h.in
@@ -19,21 +19,23 @@
 #ifndef VERSION_H
 #define VERSION_H
 
+#include <QString>
+// TODO: use namespace and functions
 #cmakedefine GIT_SHA1 "@GIT_SHA1@"
 
-#define MIRALL_STRINGIFY(...) MIRALL_TOSTRING(__VA_ARGS__)
-#define MIRALL_TOSTRING(...)  "" #__VA_ARGS__
-
 /* MIRALL version */
 #define MIRALL_VERSION_MAJOR @MIRALL_VERSION_MAJOR@
 #define MIRALL_VERSION_MINOR @MIRALL_VERSION_MINOR@
 #define MIRALL_VERSION_PATCH @MIRALL_VERSION_PATCH@
 #define MIRALL_VERSION_BUILD @MIRALL_VERSION_BUILD@
 
-#define MIRALL_VERSION_SUFFIX @MIRALL_VERSION_SUFFIX@
+inline auto MIRALL_VERSION_SUFFIX() {
+    return QStringLiteral("@MIRALL_VERSION_SUFFIX@");
+}
 
-#define MIRALL_VERSION       @MIRALL_VERSION@
-#define MIRALL_VERSION_FULL  @MIRALL_VERSION_FULL@
+inline auto MIRALL_VERSION_FULL() {
+    return QStringLiteral("@MIRALL_VERSION_FULL@");
+}
 
 #define MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"