Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Add missing license header
  Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
  Compile fix WinCE
  Ensure that we load system libraries from the correct location.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp
index 9f3b6e1..359710f 100644
--- a/src/gui/util/qdesktopservices_win.cpp
+++ b/src/gui/util/qdesktopservices_win.cpp
@@ -41,7 +41,7 @@
 
 #include <qsettings.h>
 #include <qdir.h>
-#include <qlibrary.h>
+#include <private/qsystemlibrary_p.h>
 #include <qurl.h>
 #include <qstringlist.h>
 #include <qprocess.h>
@@ -177,9 +177,9 @@ QString QDesktopServices::storageLocation(StandardLocation type)
     QString result;
 
 #ifndef Q_OS_WINCE
-        QLibrary library(QLatin1String("shell32"));
+        QSystemLibrary library(QLatin1String("shell32"));
 #else
-        QLibrary library(QLatin1String("coredll"));
+        QSystemLibrary library(QLatin1String("coredll"));
 #endif // Q_OS_WINCE
     typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
     static GetSpecialFolderPath SHGetSpecialFolderPath =
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp
index 1571b94..6e78dfd 100644
--- a/src/gui/util/qsystemtrayicon_win.cpp
+++ b/src/gui/util/qsystemtrayicon_win.cpp
@@ -55,7 +55,7 @@
 #include <commctrl.h>
 #include <shlwapi.h>
 #include <QBitmap>
-#include <QLibrary>
+#include <private/qsystemlibrary_p.h>
 #include <QApplication>
 #include <QToolTip>
 #include <QDesktopWidget>
@@ -134,14 +134,14 @@ QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object)
 
     // Allow the WM_TASKBARCREATED message through the UIPI filter on Windows Vista and higher
     static PtrChangeWindowMessageFilterEx pChangeWindowMessageFilterEx =
-        (PtrChangeWindowMessageFilterEx)QLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilterEx");
+        (PtrChangeWindowMessageFilterEx)QSystemLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilterEx");
 
     if (pChangeWindowMessageFilterEx) {
         // Call the safer ChangeWindowMessageFilterEx API if available
         pChangeWindowMessageFilterEx(winId(), MYWM_TASKBARCREATED, Q_MSGFLT_ALLOW, 0);
     } else {
         static PtrChangeWindowMessageFilter pChangeWindowMessageFilter =
-            (PtrChangeWindowMessageFilter)QLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilter");
+            (PtrChangeWindowMessageFilter)QSystemLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilter");
 
         if (pChangeWindowMessageFilter) {
             // Call the deprecated ChangeWindowMessageFilter API otherwise
@@ -352,7 +352,7 @@ void QSystemTrayIconPrivate::install_sys()
 QRect QSystemTrayIconSys::findIconGeometry(const int iconId)
 {
     static PtrShell_NotifyIconGetRect Shell_NotifyIconGetRect =
-        (PtrShell_NotifyIconGetRect)QLibrary::resolve(QLatin1String("shell32"), "Shell_NotifyIconGetRect");
+        (PtrShell_NotifyIconGetRect)QSystemLibrary::resolve(QLatin1String("shell32"), "Shell_NotifyIconGetRect");
 
     if (Shell_NotifyIconGetRect) {
         Q_NOTIFYICONIDENTIFIER nid;