Changeset 846 for trunk/src/qt3support/network/q3dns.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/qt3support/network/q3dns.cpp (modified) (3 diffs)

trunk/src/qt3support/network/q3dns.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -42 +42 @@
 #include "qplatformdefs.h"
 #include "qbytearray.h"
+
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_CYGWIN)
 # include "qt_windows.h"
@@ -2300 +2301 @@
     // try the API call GetNetworkParams() first and use registry lookup only
     // as a fallback
-    HINSTANCE hinstLib = LoadLibrary( L"iphlpapi" );
+    HINSTANCE hinstLib = ( L"iphlpapi" );
     if ( hinstLib != 0 ) {
 #ifdef Q_OS_WINCE