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

refs #921, renaming follow ups

Browse Source
This commit is contained in:
Klaus Basan
2017-03-29 02:14:53 +02:00
committed by Mathew Sutcliffe
parent 0b29ef3f78
commit 929e2883d0
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/application.cpp
View File

@@ -182,7 +182,7 @@ namespace BlackCore
{
CApplicationInfo::ApplicationMode mode;
if (isRunningInDeveloperEnvironment()) { mode |= CApplicationInfo::Developer; }
if (CBuildConfig::isBetaTest()) { mode |= CApplicationInfo::BetaTest; }
if (CBuildConfig::isDevBranch()) { mode |= CApplicationInfo::BetaTest; }
return { CApplication::getSwiftApplication(), mode, QCoreApplication::applicationFilePath(), CVersion::version(), CProcessInfo::currentProcess() };
}
@@ -218,7 +218,7 @@ namespace BlackCore
const QString &CApplication::getApplicationNameVersionBetaDev() const
{
static const QString s(QCoreApplication::instance()->applicationName() + " " + this->versionStringDevBetaInfo());
static const QString s(QCoreApplication::instance()->applicationName() + " " + this->versionStringDetailed());
return s;
}
@@ -476,7 +476,7 @@ namespace BlackCore
{
const QString env =
QLatin1String("Beta: ") %
boolToYesNo(CBuildConfig::isBetaTest()) %
boolToYesNo(CBuildConfig::isDevBranch()) %
QLatin1String(" dev.env,: ") %
boolToYesNo(isRunningInDeveloperEnvironment()) %
separator %

2
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -184,7 +184,7 @@ namespace BlackCore
this->m_network->presetServer(server);
// Fall back to observer mode, if no simulator is available or not simulating
if (CBuildConfig::isShippedVersion() && !this->getIContextSimulator()->isSimulatorSimulating())
if (CBuildConfig::isStableBranch() && !this->getIContextSimulator()->isSimulatorSimulating())
{
CLogMessage(this).info("No simulator connected or connected simulator not simulating. Falling back to observer mode");
mode = INetwork::LoginAsObserver;