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

Renamings and adjustments of developer flag

Browse Source
This commit is contained in:
Klaus Basan
2018-01-28 04:39:47 +01:00
parent e7f2d639c1
commit 301eb79eca
16 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackcore/application.cpp
View File

@@ -472,12 +472,12 @@ namespace BlackCore
const QString &CApplication::versionStringDetailed() const
{
if (this->isRunningInDeveloperEnvironment() && CBuildConfig::isLocalDeveloperDebugBuild())
if (this->isDeveloperFlagSet() && CBuildConfig::isLocalDeveloperDebugBuild())
{
static const QString s(CBuildConfig::getVersionString() + " [dev,DEVDBG]");
return s;
}
if (isRunningInDeveloperEnvironment())
if (isDeveloperFlagSet())
{
static const QString s(CBuildConfig::getVersionString() + " [dev]");
return s;
@@ -504,12 +504,17 @@ namespace BlackCore
bool CApplication::initIsRunningInDeveloperEnvironment() const
{
//
// assumption: restricted distributions are development versions
//
if (this->getApplicationInfo().isSampleOrUnitTest()) { return true; }
if (CBuildConfig::isLocalDeveloperDebugBuild()) { return true; }
const CDistribution d(this->getOwnDistribution());
const bool canSetDeveloperEnv = CBuildConfig::isLocalDeveloperDebugBuild() || d.isRestricted();
if (canSetDeveloperEnv && this->isSet(m_cmdDevelopment)) { return true; }
if (d.isRestricted() && this->isSet(m_cmdDevelopment)) { return true; }
// we can globally set a dev.flag
if (this->isSetupAvailable())
{
// assume value from setup
@@ -560,7 +565,7 @@ namespace BlackCore
boolToYesNo(CBuildConfig::isLocalDeveloperDebugBuild()) %
separator %
QStringLiteral("dev.env.: ") %
boolToYesNo(this->isRunningInDeveloperEnvironment()) %
boolToYesNo(this->isDeveloperFlagSet()) %
separator %
QStringLiteral("distribution: ") %
this->getOwnDistribution().toQString(true) %
@@ -1208,7 +1213,7 @@ namespace BlackCore
}
// dev.
m_devEnv = this->initIsRunningInDeveloperEnvironment();
m_devFlag = this->initIsRunningInDeveloperEnvironment();
// Hookin, other parsing
if (!this->parsingHookIn()) { return false; }