diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 14:34:06 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 14:34:06 +0200 |
| commit | 2735bc6759f881c786a1097580a8682e3d28f365 (patch) | |
| tree | d16cbc4e32c4f4a2f5e49083400f9ab85831b09a /src/gui/util/qsystemtrayicon_win.cpp | |
| parent | 234751504f2703d39e562966431a54c015fb990e (diff) | |
| parent | 688deeee6c8c2892becb4207f8c40dddba0e3769 (diff) | |
| download | qt4-tools-2735bc6759f881c786a1097580a8682e3d28f365.tar.gz | |
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.
Diffstat (limited to 'src/gui/util/qsystemtrayicon_win.cpp')
| -rw-r--r-- | src/gui/util/qsystemtrayicon_win.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 1571b9484e..6e78dfd965 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; |