diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-07 13:30:11 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-07 13:30:11 +0200 |
| commit | 2b6dd2c7b44e37e79b1ae929a761c17929a2e569 (patch) | |
| tree | 30f3c55312be601d29c0acbc318db75d7d06b188 /src/qt3support | |
| parent | 98a4db7321cb286cd0a7a07adeb265798a650515 (diff) | |
| parent | 2735bc6759f881c786a1097580a8682e3d28f365 (diff) | |
| download | qt4-tools-2b6dd2c7b44e37e79b1ae929a761c17929a2e569.tar.gz | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
qmake/Makefile.win32
src/corelib/io/qfsfileengine_win.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/gui/dialogs/qfiledialog_win.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/text/qfontdatabase_win.cpp
src/gui/util/qsystemtrayicon_win.cpp
src/script/utils/qscriptdate.cpp
tests/auto/qinputcontext/tst_qinputcontext.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
Diffstat (limited to 'src/qt3support')
| -rw-r--r-- | src/qt3support/network/q3dns.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp index ab042c4137..e0e9909d10 100644 --- a/src/qt3support/network/q3dns.cpp +++ b/src/qt3support/network/q3dns.cpp @@ -41,6 +41,7 @@ #include "qplatformdefs.h" #include "qbytearray.h" +#include <private/qsystemlibrary_p.h> #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_CYGWIN) # include "qt_windows.h" #else @@ -2299,7 +2300,7 @@ void Q3Dns::doResInit() bool gotNetworkParams = false; // try the API call GetNetworkParams() first and use registry lookup only // as a fallback - HINSTANCE hinstLib = LoadLibrary( L"iphlpapi" ); + HINSTANCE hinstLib = QSystemLibrary::load( L"iphlpapi" ); if ( hinstLib != 0 ) { #ifdef Q_OS_WINCE GNP getNetworkParams = (GNP) GetProcAddress( hinstLib, L"GetNetworkParams" ); |