diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-09-23 16:58:06 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2021-09-23 17:52:06 +0300 |
| commit | e4671fe6d81e0ce762e4abf6d9a2b390fd39f67b (patch) | |
| tree | 8e79b7ca76199f2a21632322c9ffe8316efed937 /src | |
| parent | 18866be1c674f5ab2b5bd7668827c36c40364e13 (diff) | |
No longer try to concatenate defines
Fixes: #8920
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/updater/updater.cpp | 5 | ||||
| -rw-r--r-- | src/libsync/configfile.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
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")) |