Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:58:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Using applicationVersion() instead of const wherever version is specified

Browse source
This commit is contained in:
Leonardo Murillo 2014-01-06 09:24:29 -06:00
parent ba79b1b329
commit 314c4ffcfa
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -156,8 +156,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
// call Menu getInstance static method to set up the menu // call Menu getInstance static method to set up the menu
_window->setMenuBar(Menu::getInstance()); _window->setMenuBar(Menu::getInstance());
qDebug("[VERSION] Build sequence: %i\n", BUILD_VERSION);
unsigned int listenPort = 0; // bind to an ephemeral port by default unsigned int listenPort = 0; // bind to an ephemeral port by default
const char** constArgv = const_cast<const char**>(argv); const char** constArgv = const_cast<const char**>(argv);
const char* portStr = getCmdOption(argc, constArgv, "--listenPort"); const char* portStr = getCmdOption(argc, constArgv, "--listenPort");
@ -194,6 +192,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
setOrganizationName(applicationInfo.value("organizationName").toString()); setOrganizationName(applicationInfo.value("organizationName").toString());
setOrganizationDomain(applicationInfo.value("organizationDomain").toString()); setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
qDebug("[VERSION] Build sequence: %s\n", applicationVersion().toStdString().c_str());
_settings = new QSettings(this); _settings = new QSettings(this);
// Check to see if the user passed in a command line option for loading a local // Check to see if the user passed in a command line option for loading a local
@ -4175,7 +4175,7 @@ void Application::attachNewHeadToNode(Node* newNode) {
void Application::updateWindowTitle(){ void Application::updateWindowTitle(){
QString title = ""; QString title = "";
QString buildVersion = " (build " + QString::number(BUILD_VERSION) + ")"; QString buildVersion = " (build " + applicationVersion() + ")";
QString username = _profile.getUsername(); QString username = _profile.getUsername();
if(!username.isEmpty()){ if(!username.isEmpty()){
title += _profile.getUsername(); title += _profile.getUsername();