From ca16acef6be5d01dd045566be9c0ac6c0d69f96a Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Mon, 13 Jan 2014 07:37:47 -0600 Subject: [PATCH] Checkpoint --- interface/InterfaceVersion.h.in | 2 +- interface/src/Application.cpp | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/interface/InterfaceVersion.h.in b/interface/InterfaceVersion.h.in index 26b2260965..60e51b4ab6 100644 --- a/interface/InterfaceVersion.h.in +++ b/interface/InterfaceVersion.h.in @@ -6,4 +6,4 @@ // Copyright (c) 2013 High Fidelity, Inc.. All rights reserved. // -const int BUILD_VERSION = @BUILD_SEQ@; +const QString BUILD_VERSION = "@BUILD_SEQ@"; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 4e9705b49c..1f433868a0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -197,22 +197,17 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : setOrganizationName(applicationInfo.value("organizationName").toString()); setOrganizationDomain(applicationInfo.value("organizationDomain").toString()); - #ifdef Q_WS_X11 - _operatingSystem = new QString("ubuntu"); - #endif - - #ifdef Q_WS_WIN + #ifdef Q_OS_WIN32 _operatingSystem = new QString("win"); #endif - #ifdef Q_WS_MACX + #ifdef Q_OS_MAC _operatingSystem = new QString("mac"); #endif checkVersion(); qDebug("[VERSION] Build sequence: %s\n", applicationVersion().toStdString().c_str()); - qDebug("[OS] %s", _operatingSystem->toStdString().c_str()); _settings = new QSettings(this);