Clean up some Q_WS_WIN

Q_WS_WIN does not exist any more.

Change-Id: Icb7f542cfcd4d21e994f246ff665583cb6b57610
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp b/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp
index 9fa9a23..9de685a 100644 (file)
--- a/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp
+++ b/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp
@@ -76,7 +76,7 @@ extern "C" MY_EXPORT int avg(int a, int b)
 
 
 //! [4]
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 #define MY_EXPORT __declspec(dllexport)
 #else
 #define MY_EXPORT

diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
index b42f82e..2ffd88e 100644 (file)
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
@@ -53,7 +53,7 @@
 #include <qstringlist.h>
 #include <qvector.h>
 
-#if !defined Q_WS_WIN32
+#if !defined Q_OS_WIN
 # include <unistd.h>
 #endif
 #include <sqlite.h>
@@ -208,7 +208,7 @@ bool QSQLite2ResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int
     // keep trying while busy, wish I could implement this better.
     while ((res = sqlite_step(currentMachine, &colNum, &fvals, &cnames)) == SQLITE_BUSY) {
         // sleep instead requesting result again immidiately.
-#if defined Q_WS_WIN32
+#if defined Q_OS_WIN
         Sleep(1000);
 #else
         sleep(1);