diff options
| author | miniak <milan.burda@gmail.com> | 2009-07-01 09:49:58 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:51:15 (GMT) |
| commit | 48406f5ae81fdcb3ba2a01471678d10213a2caa9 (patch) | |
| tree | b597fff0cdcec732f57fe6804588e0409e375ceb /src/network/kernel/qnetworkproxy_win.cpp | |
| parent | 55137901012db28857fe7638e63c78743e277c56 (diff) | |
| download | Qt-48406f5ae81fdcb3ba2a01471678d10213a2caa9.zip Qt-48406f5ae81fdcb3ba2a01471678d10213a2caa9.tar.gz Qt-48406f5ae81fdcb3ba2a01471678d10213a2caa9.tar.bz2 | |
src/network: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'src/network/kernel/qnetworkproxy_win.cpp')
| -rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index 5fda228..7052bcc2 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -43,8 +43,6 @@ #ifndef QT_NO_NETWORKPROXY -#if defined(UNICODE) - #include <qmutex.h> #include <qstringlist.h> #include <qregexp.h> @@ -269,15 +267,13 @@ void QWindowsSystemProxy::init() if (initialized) return; initialized = true; - if (QSysInfo::windowsVersion() & QSysInfo::WV_DOS_based) - return; // no point, this library is only available on 2k, XP and up #ifdef Q_OS_WINCE // Windows CE does not have any of the following API return; #else // load the winhttp.dll library - HINSTANCE winhttpHnd = LoadLibraryW(L"winhttp"); + HINSTANCE winhttpHnd = LoadLibrary(L"winhttp"); if (!winhttpHnd) return; // failed to load @@ -401,15 +397,6 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro return parseServerList(query, sp->proxyServerList); } -#else // !UNICODE - -QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &) -{ - return QList<QNetworkProxy>() << QNetworkProxy::NoProxy; -} - -#endif - QT_END_NAMESPACE #endif |