Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2021-09-23 16:58:06 +0300
committerHannah von Reth <vonreth@kde.org>2021-09-23 17:52:06 +0300
commite4671fe6d81e0ce762e4abf6d9a2b390fd39f67b (patch)
tree8e79b7ca76199f2a21632322c9ffe8316efed937 /version.h.in
parent18866be1c674f5ab2b5bd7668827c36c40364e13 (diff)
No longer try to concatenate defines
Fixes: #8920
Diffstat (limited to 'version.h.in')
-rw-r--r--version.h.in14
1 files changed, 8 insertions, 6 deletions
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@"