History

add a BUILD_TYPE to BuildInfo, fix conditional

Stephen Birarda committed 8 years ago

Commit 2cb7c9c1 parent 45b8c126 files · +43 −15Browse files

Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all

Unified · Split

interface/src/Application.cpp+4−2
@@ -1112,7 +1112,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1111 unmodified lines
11121112 qCDebug(interfaceapp) << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
11131113 qCDebug(interfaceapp) << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
11141114 qCDebug(interfaceapp) << "[VERSION] VERSION:" << BuildInfo::VERSION;
1115− qCDebug(interfaceapp) << "[VERSION] STABLE_BUILD:" << BuildInfo::STABLE_BUILD;
1115+ qCDebug(interfaceapp) << "[VERSION] BUILD_TYPE_STRING:" << BuildInfo::BUILD_TYPE_STRING;
11161116 qCDebug(interfaceapp) << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES;
11171117 #if USE_STABLE_GLOBAL_SERVICES
11181118 qCDebug(interfaceapp) << "[VERSION] We will use STABLE global services.";
@@ -1465,6 +1465,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 346 unmodified lines
14651465 { "tester", QProcessEnvironment::systemEnvironment().contains(TESTER) },
14661466 { "installer_campaign", installerCampaign },
14671467 { "installer_type", installerType },
1468+ { "build_type", BuildInfo::BUILD_TYPE_STRING },
14681469 { "previousSessionCrashed", _previousSessionCrashed },
14691470 { "previousSessionRuntime", sessionRunTime.get() },
14701471 { "cpu_architecture", QSysInfo::currentCpuArchitecture() },
@@ -6189,7 +6190,8 @@ void Application::updateWindowTitle() const { · 4718 unmodified lines
61896190 auto accountManager = DependencyManager::get<AccountManager>();
61906191
61916192 QString buildVersion = " - "
6192− + (BuildInfo::STABLE_BUILD == "1" ? QString("Version") : QString("Build")) + " " + applicationVersion();
6193+ + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build"))
6194+ + " " + applicationVersion();
61936195
61946196 QString loginStatus = accountManager->isLoggedIn() ? "" : " (NOT LOGGED IN)";
61956197