diff options
-rw-r--r-- | src/network/socket/qnativesocketengine.cpp | 4 | ||||
-rw-r--r-- | src/tools/uic/driver.cpp | 2 | ||||
-rw-r--r-- | src/tools/uic/uic.cpp | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp index 2dc6a40d99..465d26e382 100644 --- a/src/network/socket/qnativesocketengine.cpp +++ b/src/network/socket/qnativesocketengine.cpp @@ -927,7 +927,7 @@ bool QNativeSocketEngine::waitForWrite(int msecs, bool *timedOut) // On Windows, the socket is in connected state if a call to // select(writable) is successful. In this case we should not // issue a second call to WSAConnect() -#if defined (Q_WS_WIN) +#if defined (Q_OS_WIN) if (ret > 0) { setState(QAbstractSocket::ConnectedState); d_func()->fetchConnectionParameters(); @@ -980,7 +980,7 @@ bool QNativeSocketEngine::waitForReadOrWrite(bool *readyToRead, bool *readyToWri // On Windows, the socket is in connected state if a call to // select(writable) is successful. In this case we should not // issue a second call to WSAConnect() -#if defined (Q_WS_WIN) +#if defined (Q_OS_WIN) if (checkWrite && ((readyToWrite && *readyToWrite) || !readyToWrite) && ret > 0) { setState(QAbstractSocket::ConnectedState); d_func()->fetchConnectionParameters(); diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index d913ae3b18..0dd528c4cb 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -300,7 +300,7 @@ bool Driver::uic(const QString &fileName, QTextStream *out) if (out) { m_output = out; } else { -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN // As one might also redirect the output to a file on win, // we should not create the textstream with QFile::Text flag. // The redirected file is opened in TextMode and this will diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index c5465656dd..347efb1042 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -62,10 +62,6 @@ #include <QtCore/QTextStream> #include <QtCore/QDateTime> -#if defined Q_WS_WIN -#include <qt_windows.h> -#endif - QT_BEGIN_NAMESPACE Uic::Uic(Driver *d) |