mirror of
https://github.com/overte-org/overte.git
synced 2025-08-05 22:40:12 +02:00
Checkpoint
This commit is contained in:
parent
1c2b27f0f4
commit
ca16acef6b
2 changed files with 3 additions and 8 deletions
|
@ -6,4 +6,4 @@
|
||||||
// Copyright (c) 2013 High Fidelity, Inc.. All rights reserved.
|
// Copyright (c) 2013 High Fidelity, Inc.. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
const int BUILD_VERSION = @BUILD_SEQ@;
|
const QString BUILD_VERSION = "@BUILD_SEQ@";
|
||||||
|
|
|
@ -197,22 +197,17 @@ 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());
|
||||||
|
|
||||||
#ifdef Q_WS_X11
|
#ifdef Q_OS_WIN32
|
||||||
_operatingSystem = new QString("ubuntu");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef Q_WS_WIN
|
|
||||||
_operatingSystem = new QString("win");
|
_operatingSystem = new QString("win");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef Q_WS_MACX
|
#ifdef Q_OS_MAC
|
||||||
_operatingSystem = new QString("mac");
|
_operatingSystem = new QString("mac");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
checkVersion();
|
checkVersion();
|
||||||
|
|
||||||
qDebug("[VERSION] Build sequence: %s\n", applicationVersion().toStdString().c_str());
|
qDebug("[VERSION] Build sequence: %s\n", applicationVersion().toStdString().c_str());
|
||||||
qDebug("[OS] %s", _operatingSystem->toStdString().c_str());
|
|
||||||
|
|
||||||
_settings = new QSettings(this);
|
_settings = new QSettings(this);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue