summaryrefslogtreecommitdiffstats
path: root/src/gui/accessible
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-09-07 11:30:11 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-09-07 11:30:11 (GMT)
commit2b6dd2c7b44e37e79b1ae929a761c17929a2e569 (patch)
tree30f3c55312be601d29c0acbc318db75d7d06b188 /src/gui/accessible
parent98a4db7321cb286cd0a7a07adeb265798a650515 (diff)
parent2735bc6759f881c786a1097580a8682e3d28f365 (diff)
downloadQt-2b6dd2c7b44e37e79b1ae929a761c17929a2e569.zip
Qt-2b6dd2c7b44e37e79b1ae929a761c17929a2e569.tar.gz
Qt-2b6dd2c7b44e37e79b1ae929a761c17929a2e569.tar.bz2
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/accessible')
-rw-r--r--src/gui/accessible/qaccessible_win.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp
index fc8575f..132d01f 100644
--- a/src/gui/accessible/qaccessible_win.cpp
+++ b/src/gui/accessible/qaccessible_win.cpp
@@ -42,7 +42,7 @@
#ifndef QT_NO_ACCESSIBILITY
#include "qapplication.h"
-#include "qlibrary.h"
+#include <private/qsystemlibrary_p.h>
#include "qmessagebox.h" // ### dependency
#include "qt_windows.h"
#include "qwidget.h"
@@ -243,7 +243,7 @@ void QAccessible::updateAccessibility(QObject *o, int who, Event reason)
static bool resolvedNWE = false;
if (!resolvedNWE) {
resolvedNWE = true;
- ptrNotifyWinEvent = (PtrNotifyWinEvent)QLibrary::resolve(QLatin1String("user32"), "NotifyWinEvent");
+ ptrNotifyWinEvent = (PtrNotifyWinEvent)QSystemLibrary::resolve(QLatin1String("user32"), "NotifyWinEvent");
}
if (!ptrNotifyWinEvent)
return;