Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Add missing license header
  Fixed input context trying to squeeze content into a full widget.
  Cleaned up position tracking in the Symbian input methods.
  Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
  Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
  Compile fix WinCE
  Ensure that we load system libraries from the correct location.
  Some small Solaris fixes.
  Fix QtScript Date <--> QDateTime (local time) conversion
  Fix Qt applications freezing until mouse/keyboard events occur.
  Recognize GL_ARB_shader_objects as indicating shaders

3 files changed, 24 insertions, 26 deletions

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 0c48bfd..78028eb 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -68,7 +68,6 @@ extern void qt_wince_hide_taskbar(HWND hwnd); //defined in qguifunctions_wince.c
 #include "qdatetime.h"
 #include "qpointer.h"
 #include "qhash.h"
-#include "qlibrary.h"
 #include "qmetaobject.h"
 #include "qmime.h"
 #include "qpainter.h"
@@ -94,6 +93,7 @@ extern void qt_wince_hide_taskbar(HWND hwnd); //defined in qguifunctions_wince.c
 #include "qdebug.h"
 #include <private/qkeymapper_p.h>
 #include <private/qlocale_p.h>
+#include <private/qsystemlibrary_p.h>
 #include "qevent_p.h"
 
 //#define ALIEN_DEBUG
@@ -206,7 +206,7 @@ static void resolveAygLibs()
 {
     if (!aygResolved) {
         aygResolved = true;
-        QLibrary ayglib(QLatin1String("aygshell"));
+        QSystemLibrary ayglib(QLatin1String("aygshell"));
         if (!ayglib.load())
             return;
         ptrRecognizeGesture = (AygRecognizeGesture) ayglib.resolve("SHRecognizeGesture");
@@ -833,10 +833,10 @@ void qt_init(QApplicationPrivate *priv, int)
 
 #ifndef Q_OS_WINCE
     ptrUpdateLayeredWindowIndirect =
-        (PtrUpdateLayeredWindowIndirect) QLibrary::resolve(QLatin1String("user32"),
+        (PtrUpdateLayeredWindowIndirect) QSystemLibrary::resolve(QLatin1String("user32"),
                                                            "UpdateLayeredWindowIndirect");
     ptrUpdateLayeredWindow =
-        (PtrUpdateLayeredWindow) QLibrary::resolve(QLatin1String("user32"),
+        (PtrUpdateLayeredWindow) QSystemLibrary::resolve(QLatin1String("user32"),
                                                    "UpdateLayeredWindow");
 
     if (ptrUpdateLayeredWindow && !ptrUpdateLayeredWindowIndirect)
@@ -844,7 +844,7 @@ void qt_init(QApplicationPrivate *priv, int)
 
     // Notify Vista and Windows 7 that we support highter DPI settings
     ptrSetProcessDPIAware = (PtrSetProcessDPIAware)
-        QLibrary::resolve(QLatin1String("user32"), "SetProcessDPIAware");
+        QSystemLibrary::resolve(QLatin1String("user32"), "SetProcessDPIAware");
     if (ptrSetProcessDPIAware)
         ptrSetProcessDPIAware();
 #endif
@@ -865,30 +865,28 @@ void qt_init(QApplicationPrivate *priv, int)
 #elif !defined(Q_WS_WINCE)
   #if !defined(QT_NO_NATIVE_GESTURES)
     priv->GetGestureInfo =
-            (PtrGetGestureInfo)QLibrary::resolve(QLatin1String("user32"),
+            (PtrGetGestureInfo)QSystemLibrary::resolve(QLatin1String("user32"),
                                                  "GetGestureInfo");
     priv->GetGestureExtraArgs =
-            (PtrGetGestureExtraArgs)QLibrary::resolve(QLatin1String("user32"),
+            (PtrGetGestureExtraArgs)QSystemLibrary::resolve(QLatin1String("user32"),
                                                       "GetGestureExtraArgs");
     priv->CloseGestureInfoHandle =
-            (PtrCloseGestureInfoHandle)QLibrary::resolve(QLatin1String("user32"),
+            (PtrCloseGestureInfoHandle)QSystemLibrary::resolve(QLatin1String("user32"),
                                                          "CloseGestureInfoHandle");
     priv->SetGestureConfig =
-            (PtrSetGestureConfig)QLibrary::resolve(QLatin1String("user32"),
+            (PtrSetGestureConfig)QSystemLibrary::resolve(QLatin1String("user32"),
                                                    "SetGestureConfig");
     priv->GetGestureConfig =
-            (PtrGetGestureConfig)QLibrary::resolve(QLatin1String("user32"),
+            (PtrGetGestureConfig)QSystemLibrary::resolve(QLatin1String("user32"),
                                                    "GetGestureConfig");
   #endif // QT_NO_NATIVE_GESTURES
+    QSystemLibrary libTheme(QLatin1String("uxtheme"));
     priv->BeginPanningFeedback =
-            (PtrBeginPanningFeedback)QLibrary::resolve(QLatin1String("uxtheme"),
-                                                       "BeginPanningFeedback");
+            (PtrBeginPanningFeedback)libTheme.resolve("BeginPanningFeedback");
     priv->UpdatePanningFeedback =
-            (PtrUpdatePanningFeedback)QLibrary::resolve(QLatin1String("uxtheme"),
-                                                        "UpdatePanningFeedback");
+            (PtrUpdatePanningFeedback)libTheme.resolve("UpdatePanningFeedback");
     priv->EndPanningFeedback =
-        (PtrEndPanningFeedback)QLibrary::resolve(QLatin1String("uxtheme"),
-                                                   "EndPanningFeedback");
+        (PtrEndPanningFeedback)libTheme.resolve("EndPanningFeedback");
 #endif
 #endif // QT_NO_GESTURES
 }
@@ -2338,7 +2336,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
                 if (!oleaccChecked) {
                     oleaccChecked = true;
 #if !defined(Q_OS_WINCE)
-                    ptrLresultFromObject = (PtrLresultFromObject)QLibrary::resolve(QLatin1String("oleacc.dll"), "LresultFromObject");
+                    ptrLresultFromObject = (PtrLresultFromObject)QSystemLibrary::resolve(QLatin1String("oleacc"), "LresultFromObject");
 #endif
                 }
                 if (ptrLresultFromObject) {
@@ -3142,7 +3140,7 @@ bool QETWidget::translateMouseEvent(const MSG &msg)
             if (curWin != 0) {
                 if (!trackMouseEventLookup) {
                     trackMouseEventLookup = true;
-                    ptrTrackMouseEvent = (PtrTrackMouseEvent)QLibrary::resolve(QLatin1String("comctl32"), "_TrackMouseEvent");
+                    ptrTrackMouseEvent = (PtrTrackMouseEvent)QSystemLibrary::resolve(QLatin1String("comctl32"), "_TrackMouseEvent");
                 }
                 if (ptrTrackMouseEvent && !qApp->d_func()->inPopupMode()) {
                     // We always have to set the tracking, since
@@ -3677,7 +3675,7 @@ static void initWinTabFunctions()
     if (!qt_is_gui_used)
         return;
 
-    QLibrary library(QLatin1String("wintab32"));
+    QSystemLibrary library(QLatin1String("wintab32"));
     if (library.load()) {
         ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
         ptrWTGet = (PtrWTGet)library.resolve("WTGetW");
@@ -4100,7 +4098,7 @@ void QApplicationPrivate::initializeMultitouch_sys()
                 value & (QT_NID_INTEGRATED_TOUCH | QT_NID_EXTERNAL_TOUCH | QT_NID_MULTI_INPUT);
     }
 
-    QLibrary library(QLatin1String("user32"));
+    QSystemLibrary library(QLatin1String("user32"));
     // MinGW (g++ 3.4.5) accepts only C casts.
     RegisterTouchWindow = (PtrRegisterTouchWindow)(library.resolve("RegisterTouchWindow"));
     GetTouchInputInfo = (PtrGetTouchInputInfo)(library.resolve("GetTouchInputInfo"));
diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/kernel/qdesktopwidget_win.cpp
index 07dbc24..1b2dfe7 100644
--- a/src/gui/kernel/qdesktopwidget_win.cpp
+++ b/src/gui/kernel/qdesktopwidget_win.cpp
@@ -42,7 +42,7 @@
 #include "qdesktopwidget.h"
 #include "qt_windows.h"
 #include "qapplication_p.h"
-#include "qlibrary.h"
+#include <private/qsystemlibrary_p.h>
 #include <qvector.h>
 #include <limits.h>
 #ifdef Q_WS_WINCE
@@ -155,7 +155,7 @@ void QDesktopWidgetPrivate::init(QDesktopWidget *that)
     screenCount = 0;
 
 #ifndef Q_OS_WINCE
-    QLibrary user32Lib(QLatin1String("user32"));
+    QSystemLibrary user32Lib(QLatin1String("user32"));
     if (user32Lib.load()) {
         enumDisplayMonitors = (EnumFunc)user32Lib.resolve("EnumDisplayMonitors");
         getMonitorInfo = (InfoFunc)user32Lib.resolve("GetMonitorInfoW");
@@ -173,7 +173,7 @@ void QDesktopWidgetPrivate::init(QDesktopWidget *that)
     enumDisplayMonitors = 0;
     getMonitorInfo = 0;
 #else
-    QLibrary coreLib(QLatin1String("coredll"));
+    QSystemLibrary coreLib(QLatin1String("coredll"));
     if (coreLib.load()) {
         // CE >= 4.0 case
         enumDisplayMonitors = (EnumFunc)coreLib.resolve("EnumDisplayMonitors");
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index 59035b1..3d206fd 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -47,7 +47,6 @@
 #include "qevent.h"
 #include "qimage.h"
 #include "qlayout.h"
-#include "qlibrary.h"
 #include "qpainter.h"
 #include "qstack.h"
 #include "qt_windows.h"
@@ -65,6 +64,7 @@
 #include <private/qapplication_p.h>
 #include <private/qwininputcontext_p.h>
 #include <private/qpaintengine_raster_p.h>
+#include <private/qsystemlibrary_p.h>
 
 #if defined(Q_WS_WINCE)
 #include "qguifunctions_wince.h"
@@ -148,7 +148,7 @@ static void init_wintab_functions()
 #else
     if (!qt_is_gui_used)
         return;
-    QLibrary library(QLatin1String("wintab32"));
+    QSystemLibrary library(QLatin1String("wintab32"));
     ptrWTOpen = (PtrWTOpen)library.resolve("WTOpenW");
     ptrWTInfo = (PtrWTInfo)library.resolve("WTInfoW");
     ptrWTClose = (PtrWTClose)library.resolve("WTClose");
@@ -1890,7 +1890,7 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level)
     static bool function_resolved = false;
     if (!function_resolved) {
         ptrSetLayeredWindowAttributes =
-            (PtrSetLayeredWindowAttributes) QLibrary::resolve(QLatin1String("user32"),
+            (PtrSetLayeredWindowAttributes) QSystemLibrary::resolve(QLatin1String("user32"),
                                                               "SetLayeredWindowAttributes");
         function_resolved = true;
     }