1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up some Q_WS_WIN

Browse Source 
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>
This commit is contained in:
Debao Zhang 2012-02-22 11:41:28 -08:00 committed by Qt by Nokia
parent 4ee14d6f87
commit 4df6e05849
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp
View File

@ -76,7 +76,7 @@ extern "C" MY_EXPORT int avg(int a, int b)
//! [4] //! [4]
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
#define MY_EXPORT __declspec(dllexport) #define MY_EXPORT __declspec(dllexport)
#else #else
#define MY_EXPORT #define MY_EXPORT

4
src/sql/drivers/sqlite2/qsql_sqlite2.cpp
View File

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