diff options
-rw-r--r-- | plugins/soundsourcem4a/soundsourcem4a.h | 2 | ||||
-rw-r--r-- | plugins/soundsourcemediafoundation/soundsourcemediafoundation.h | 2 | ||||
-rw-r--r-- | plugins/soundsourcewv/soundsourcewv.h | 2 | ||||
-rw-r--r-- | src/util/performancetimer.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/soundsourcem4a/soundsourcem4a.h b/plugins/soundsourcem4a/soundsourcem4a.h index a0ee767832..c800c713b5 100644 --- a/plugins/soundsourcem4a/soundsourcem4a.h +++ b/plugins/soundsourcem4a/soundsourcem4a.h @@ -30,7 +30,7 @@ #include "m4a/ip.h" //As per QLibrary docs: http://doc.trolltech.com/4.6/qlibrary.html#resolve -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #define MY_EXPORT __declspec(dllexport) #else #define MY_EXPORT diff --git a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h index 6149b890f9..ed7b57918b 100644 --- a/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h +++ b/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h @@ -27,7 +27,7 @@ #include "defs_version.h" #include "soundsource.h" -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #define MY_EXPORT __declspec(dllexport) #else #define MY_EXPORT diff --git a/plugins/soundsourcewv/soundsourcewv.h b/plugins/soundsourcewv/soundsourcewv.h index 05a6787902..5589bb7a5c 100644 --- a/plugins/soundsourcewv/soundsourcewv.h +++ b/plugins/soundsourcewv/soundsourcewv.h @@ -12,7 +12,7 @@ #include "wavpack/wavpack.h" -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #define MY_EXPORT __declspec(dllexport) #else #define MY_EXPORT diff --git a/src/util/performancetimer.cpp b/src/util/performancetimer.cpp index b0f67ed812..d1e58c1118 100644 --- a/src/util/performancetimer.cpp +++ b/src/util/performancetimer.cpp @@ -54,7 +54,7 @@ #include <sys/time.h> #include <time.h> #include <unistd.h> -#elif defined(Q_WS_WIN) +#elif defined(Q_OS_WIN) #include <windows.h> #endif @@ -226,7 +226,7 @@ qint64 PerformanceTimer::difference(PerformanceTimer* timer) } ////////////////////////////// Windows ////////////////////////////// -#elif defined(Q_WS_WIN) +#elif defined(Q_OS_WIN) static qint64 getTimeFromTick(quint64 elapsed) { |