flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 15:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #921, use QVersionNumber

Browse Source 
* CVersion removed
* remaining utility functions moved to CBuildConfig
* patch version -> micro version (Qt naming)
* using classes adjusted
This commit is contained in:
Klaus Basan
2017-03-30 03:19:17 +02:00
committed by Mathew Sutcliffe
parent ec297d5838
commit f85501c7bf
9 changed files with 46 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/application.cpp
View File

@@ -112,7 +112,7 @@ namespace BlackCore
{
if (withMetadata) { CApplication::registerMetadata(); }
QCoreApplication::setApplicationName(this->m_applicationName);
QCoreApplication::setApplicationVersion(CVersion::version());
QCoreApplication::setApplicationVersion(CBuildConfig::getVersionString());
this->setObjectName(this->m_applicationName);
const QString executable = QFileInfo(QCoreApplication::applicationFilePath()).fileName();
if (executable.startsWith("test"))
@@ -184,7 +184,7 @@ namespace BlackCore
CApplicationInfo::ApplicationMode mode;
if (isRunningInDeveloperEnvironment()) { mode |= CApplicationInfo::Developer; }
if (CBuildConfig::isDevBranch()) { mode |= CApplicationInfo::BetaTest; }
return { CApplication::getSwiftApplication(), mode, QCoreApplication::applicationFilePath(), CVersion::version(), CProcessInfo::currentProcess() };
return { CApplication::getSwiftApplication(), mode, QCoreApplication::applicationFilePath(), CBuildConfig::getVersionString(), CProcessInfo::currentProcess() };
}
CApplicationInfoList CApplication::getRunningApplications()
@@ -213,7 +213,7 @@ namespace BlackCore
const QString &CApplication::getApplicationNameAndVersion() const
{
static const QString s(QCoreApplication::instance()->applicationName() + " " + CVersion::version());
static const QString s(QCoreApplication::instance()->applicationName() + " " + CBuildConfig::getVersionString());
return s;
}
@@ -296,6 +296,8 @@ namespace BlackCore
bool CApplication::start()
{
this->m_started = false; // reset
// parse if needed, parsing contains its own error handling
if (!this->m_parsed)
{
@@ -525,7 +527,7 @@ namespace BlackCore
QString CApplication::getInfoString(const QString &separator) const
{
const QString str =
CVersion::version() %
CBuildConfig::getVersionString() %
QLatin1Char(' ') % (CBuildConfig::isReleaseBuild() ? QLatin1String("Release build") : QLatin1String("Debug build")) %
separator %
getEnvironmentInfoString(separator) %
@@ -1147,7 +1149,7 @@ namespace BlackCore
// Caliper (mini-breakpad-server) annotations
annotations["prod"] = executable().toStdString();
annotations["ver"] = CVersion::version().toStdString();
annotations["ver"] = CBuildConfig::getVersionString().toStdString();
QDir().mkpath(database);
m_crashReportDatabase = CrashReportDatabase::Initialize(qstringToFilePath(database));