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/gui/kernel/qwidget_win.cpp | |
| 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/gui/kernel/qwidget_win.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 59035b16a0..3d206fdefc 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; } |