diff options
| author | Tim Jenssen <tim.jenssen@nokia.com> | 2012-04-23 20:10:38 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-04-24 12:11:06 +0200 |
| commit | f4a7e3d45d9ef5a5e49639871bb99ab423b7faf3 (patch) | |
| tree | 9c8ca5e0f0827dfc8e1da2270b39c45aa7674e83 /src/libs/installer/environmentvariablesoperation.cpp | |
| parent | 9f6c6591ccda2635ce6aa5fea08d992b5e61e306 (diff) | |
use Q_OS instead of Q_WS defines
Change-Id: I2bbc5b97b8aa9d3dbe77a3334c0182158c2db9c5
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'src/libs/installer/environmentvariablesoperation.cpp')
| -rw-r--r-- | src/libs/installer/environmentvariablesoperation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/installer/environmentvariablesoperation.cpp b/src/libs/installer/environmentvariablesoperation.cpp index c71a250c9..68693d455 100644 --- a/src/libs/installer/environmentvariablesoperation.cpp +++ b/src/libs/installer/environmentvariablesoperation.cpp @@ -37,7 +37,7 @@ #include "environment.h" -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN # include <windows.h> #endif @@ -57,7 +57,7 @@ void EnvironmentVariableOperation::backup() { } -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN static bool broadcastChange() { // Use SendMessageTimeout to Broadcast a message to the whole system to update settings of all // running applications. This is needed to activate the changes done above without logout+login. @@ -138,7 +138,7 @@ bool EnvironmentVariableOperation::performOperation() const QString value = arguments().at(1); bool isPersistent = false; -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN isPersistent = arguments().count() >= 3 ? arguments().at(2) == QLatin1String("true") : true; const bool isSystemWide = arguments().count() >= 4 ? arguments().at(3) == QLatin1String("true") : false; QString oldvalue; @@ -183,7 +183,7 @@ bool EnvironmentVariableOperation::undoOperation() const QString value = arguments().at(1); const QString oldvalue = this->value(QLatin1String("oldvalue")).toString(); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN const bool isPersistent = arguments().count() >= 3 ? arguments().at(2) == QLatin1String("true") : true; #else const bool isPersistent = false; @@ -197,7 +197,7 @@ bool EnvironmentVariableOperation::undoOperation() return doUndo; } -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN const bool isSystemWide = arguments().count() >= 4 ? arguments().at(3) == QLatin1String("true") : false; const QString regPath = isSystemWide ? QLatin1String("HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\" |