diff options
| author | Debao Zhang <dbzhang800@gmail.com> | 2012-02-22 11:41:28 -0800 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 08:37:29 +0100 |
| commit | 4df6e058490b4202a5bb5ac0a34b7b2b18493250 (patch) | |
| tree | f0ad93501a7c4a345732128d0dfaa95df00e2914 | |
| parent | 4ee14d6f87688492e64db77fd89b48c7fcc98a63 (diff) | |
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>
| -rw-r--r-- | doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp | 2 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp b/doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp index 9fa9a23234..9de685a7b5 100644 --- 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 b42f82e800..2ffd88e8c5 100644 --- 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); |