Issue #92 Bump version number and switch to 3-part version numbers

This commit is contained in:
Mat Sutcliffe
2021-02-17 23:38:28 +00:00
parent 8f11e42b15
commit 855c97bc88
9 changed files with 19 additions and 27 deletions

View File

@@ -170,7 +170,7 @@ namespace BlackConfig
const QVersionNumber &CBuildConfig::getVersion()
{
static const QVersionNumber v { versionMajor(), versionMinor(), versionMicro(), versionRevision() };
static const QVersionNumber v { versionMajor(), versionMinor(), versionRevision() };
return v;
}
@@ -182,7 +182,7 @@ namespace BlackConfig
const QString &CBuildConfig::getShortVersionString()
{
static const QVersionNumber v { versionMajor(), versionMinor(), versionMicro() };
static const QVersionNumber v { versionMajor(), versionMinor() };
static const QString s(v.toString());
return s;
}

View File

@@ -160,9 +160,6 @@ namespace BlackConfig
static constexpr int versionMinor(); // defined in buildconfig_gen.inc.in
//! Patch version
static constexpr int versionMicro(); // defined in buildconfig_gen.inc.in
//! Revision version
static int versionRevision(); // defined in buildconfig_gen.cpp.in
};
} // ns

View File

@@ -112,4 +112,3 @@ constexpr bool BlackConfig::CBuildConfig::isVatsimVersion()
constexpr int BlackConfig::CBuildConfig::versionMajor() { return $$swiftConfig(version.major); }
constexpr int BlackConfig::CBuildConfig::versionMinor() { return $$swiftConfig(version.minor); }
constexpr int BlackConfig::CBuildConfig::versionMicro() { return $$swiftConfig(version.micro); }