diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-01-16 15:41:45 +0100 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-01-16 15:41:45 +0100 |
| commit | c3b20dc648cfd02d3a26bbd6fab0db5a7d39fc05 (patch) | |
| tree | 573ad55f55da490d02d500875de8c53848702f59 /src | |
| parent | Converted repository to mercurial (diff) | |
| download | smolbote-c3b20dc648cfd02d3a26bbd6fab0db5a7d39fc05.tar.xz | |
Fixed build scripts for use with the mercurial repository
Diffstat (limited to 'src')
| -rw-r--r-- | src/forms/aboutdialog.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/version.h.in | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/forms/aboutdialog.cpp b/src/forms/aboutdialog.cpp index e5dfc7d..93ee86b 100644 --- a/src/forms/aboutdialog.cpp +++ b/src/forms/aboutdialog.cpp @@ -24,8 +24,8 @@ constexpr const char *getCompiler() inline const QString getLongVersion() { -#ifdef GIT_DESCRIBE - return QString(GIT_DESCRIBE); +#ifdef SMOLBOTE_DESCRIBE + return QString(SMOLBOTE_DESCRIBE); #else return qApp->applicationVersion(); #endif diff --git a/src/main.cpp b/src/main.cpp index ca27783..fb80b7e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -60,8 +60,8 @@ int main(int argc, char *argv[]) { // Create application object Browser instance(argc, argv); -#ifdef GIT_VERSION - instance.setApplicationVersion(GIT_VERSION); +#ifdef SMOLBOTE_VERSION + instance.setApplicationVersion(SMOLBOTE_VERSION); #else instance.setApplicationVersion("1.0.0"); #endif diff --git a/src/version.h.in b/src/version.h.in index bcb28d3..0f597ed 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,9 +1,9 @@ #ifndef VERSION_H #define VERSION_H -// git describe --abbrev=0, 0.2.0 -#define GIT_VERSION "@GitVersion@" -// git describe, 0.2.0-15-g3b2d3c4 -#define GIT_DESCRIBE "@GitDescribe@" +// 0.2.1 +#define SMOLBOTE_VERSION "@VcsVersion@" +// 0.2.1-0fd54a21a551+ +#define SMOLBOTE_DESCRIBE "@VcsVersion@-@VcsCommit@" #endif //VERSION_H |