Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve definition of MIRALL_VERSION_SUFFIX and MIRALL_VERSION_BUILD #7625

Merged
merged 1 commit into from
Dec 11, 2024
Merged

improve definition of MIRALL_VERSION_SUFFIX and MIRALL_VERSION_BUILD #7625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libsync/theme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 8 additions & 9 deletions version.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@;
Expand Down
Loading