From 6ee1c645aca0a72d634af9cef986c45d66255351 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 21 May 2012 15:35:58 +0200 Subject: QtNetwork: Fix mingw-warnings. Constructor order, use Q_OS_WIN. Change-Id: Ie45aa9c3aed45437feb66d8ddcfb22530c441435 Reviewed-by: Shane Kearns --- src/network/kernel/qauthenticator.cpp | 6 +++--- src/network/kernel/qauthenticator_p.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index c1df4571d3..9d3159407a 100644 --- 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 b842dc3ab0..491e004737 100644 --- 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. -- cgit v1.2.3