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/kdtools/kdupdaterupdateoperations.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/kdtools/kdupdaterupdateoperations.cpp')
| -rw-r--r-- | src/libs/kdtools/kdupdaterupdateoperations.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/kdtools/kdupdaterupdateoperations.cpp b/src/libs/kdtools/kdupdaterupdateoperations.cpp index 681631542..9e2f5eb21 100644 --- a/src/libs/kdtools/kdupdaterupdateoperations.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperations.cpp @@ -39,7 +39,7 @@ #define SUPPORT_DETACHED_PROCESS_EXECUTION #ifdef SUPPORT_DETACHED_PROCESS_EXECUTION -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #include <windows.h> #endif #endif @@ -477,9 +477,9 @@ bool MkdirOperation::undoOperation() return removeDirectory(createdDir.path(), &errorString); // even remove some hidden, OS-created files in there -#if defined Q_WS_MAC +#if defined Q_OS_MAC QFile::remove(createdDir.path() + QLatin1String("/.DS_Store")); -#elif defined Q_WS_WIN +#elif defined Q_OS_WIN QFile::remove(createdDir.path() + QLatin1String("/Thumbs.db")); #endif @@ -798,7 +798,7 @@ void ExecuteOperation::backup() // this is not possible, since the process can do whatever... } -#if defined(SUPPORT_DETACHED_PROCESS_EXECUTION) && defined(Q_WS_WIN) +#if defined(SUPPORT_DETACHED_PROCESS_EXECUTION) && defined(Q_OS_WIN) // stolen from qprocess_win.cpp static QString qt_create_commandline(const QString &program, const QStringList &arguments) { @@ -866,7 +866,7 @@ bool ExecuteOperation::performOperation() // unix style: when there's an ampersand after the command, it's started detached if (args.count() >= 2 && args.last() == QLatin1String("&")) { args.pop_back(); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN QString arguments = qt_create_commandline(args.front(), args.mid(1)); PROCESS_INFORMATION pinfo; |