mirror of
https://github.com/nextcloud/desktop.git
synced 2025-10-26 11:17:43 +00:00
improve definition of MIRALL_VERSION_SUFFIX and MIRALL_VERSION_BUILD
should allow ompiling with MIRALL_VERSION_SUFFIX be empty Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
parent
57118ce57e
commit
6310e3e645
@ -214,7 +214,7 @@ QString Theme::version() const
|
||||
|
||||
QString Theme::versionSuffix() const
|
||||
{
|
||||
return QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
|
||||
return QString::fromLatin1(MIRALL_VERSION_SUFFIX);
|
||||
}
|
||||
|
||||
QString Theme::configFileName() const
|
||||
|
||||
17
version.h.in
17
version.h.in
@ -25,17 +25,16 @@
|
||||
#define MIRALL_TOSTRING(s) #s
|
||||
|
||||
/* 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@
|
||||
constexpr int MIRALL_VERSION_MAJOR = @MIRALL_VERSION_MAJOR@;
|
||||
constexpr int MIRALL_VERSION_MINOR = @MIRALL_VERSION_MINOR@;
|
||||
constexpr int MIRALL_VERSION_PATCH = @MIRALL_VERSION_PATCH@;
|
||||
constexpr int MIRALL_VERSION_BUILD = @MIRALL_VERSION_BUILD@;
|
||||
constexpr auto MIRALL_VERSION_SUFFIX = "@MIRALL_VERSION_SUFFIX@";
|
||||
|
||||
#define MIRALL_VERSION_SUFFIX @MIRALL_VERSION_SUFFIX@
|
||||
#cmakedefine MIRALL_VERSION @MIRALL_VERSION@
|
||||
#cmakedefine MIRALL_VERSION_FULL @MIRALL_VERSION_FULL@
|
||||
|
||||
#define MIRALL_VERSION @MIRALL_VERSION@
|
||||
#define MIRALL_VERSION_FULL @MIRALL_VERSION_FULL@
|
||||
|
||||
#define MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"
|
||||
#cmakedefine MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"
|
||||
|
||||
constexpr int NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR = @NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR@;
|
||||
constexpr int NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MINOR = @NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MINOR@;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user