QtNetwork: Fix mingw-warnings.

Constructor order, use Q_OS_WIN.

Change-Id: Ie45aa9c3aed45437feb66d8ddcfb22530c441435
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index c1df457..9d31594 100644 (file)
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -339,12 +339,12 @@ public:
 
 QAuthenticatorPrivate::QAuthenticatorPrivate()
     : method(None)
+    #ifdef Q_OS_WIN
+    , ntlmWindowsHandles(0)
+    #endif
     , hasFailed(false)
     , phase(Start)
     , nonceCount(0)
-#ifdef Q_OS_WIN32
-    , ntlmWindowsHandles(0)
-#endif
 {
     cnonce = QCryptographicHash::hash(QByteArray::number(qrand(), 16) + QByteArray::number(qrand(), 16),
                                       QCryptographicHash::Md5).toHex();

diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h
index b842dc3..491e004 100644 (file)
--- a/src/network/kernel/qauthenticator_p.h
+++ b/src/network/kernel/qauthenticator_p.h
@@ -80,7 +80,7 @@ public:
     Method method;
     QString realm;
     QByteArray challenge;
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
     QNtlmWindowsHandles *ntlmWindowsHandles;
 #endif
     bool hasFailed; //credentials have been tried but rejected by server.