diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-05-24 10:23:36 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-05-25 13:00:19 +0000 |
| commit | decbd7c63334e97ace549ffcb7d2f6fe5eeb5640 (patch) | |
| tree | 3446c47e0b6caf26cdc756f391b2707a61ce4b7a /src/winextras/qwinthumbnailtoolbar.cpp | |
| parent | 4d28fcdb35a1412ce06f460227bf762bff8af892 (diff) | |
Increase API level to 0x600 (Windows Vista).
Directly link against dwmapi which should be present on Windows Vista and
remove duplicated header constants. Only the functions for iconic live preview
which are present on Windows 7 onwards are still dynamically resolved.
Similarly, shell32 can now be directly linked, leaving
SetCurrentProcessExplicitAppUserModelID() present on Windows 7 onwards.
Task-number: QTBUG-51673
Change-Id: I54b6827d4582318542729fa43f73f2c4e41ec71f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/winextras/qwinthumbnailtoolbar.cpp')
| -rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index 0d83ef6..58978f9 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -321,11 +321,9 @@ bool QWinThumbnailToolBar::iconicPixmapNotificationsEnabled() const { Q_D(const QWinThumbnailToolBar); const HWND hwnd = d->handle(); - if (!hwnd || !qtDwmApiDll.dwmGetWindowAttribute) + if (!hwnd) return false; - qtDwmApiDll.init(); - return qtDwmApiDll.dwmGetWindowAttribute && hwnd - && QtDwmApiDll::booleanWindowAttribute(hwnd, dWMWA_FORCE_ICONIC_REPRESENTATION); + return QtDwmApiDll::booleanWindowAttribute(hwnd, dWMWA_FORCE_ICONIC_REPRESENTATION); } void QWinThumbnailToolBar::setIconicPixmapNotificationsEnabled(bool enabled) @@ -336,8 +334,7 @@ void QWinThumbnailToolBar::setIconicPixmapNotificationsEnabled(bool enabled) qWarning() << Q_FUNC_INFO << "invoked with hwnd=0"; return; } - qtDwmApiDll.init(); - if (!qtDwmApiDll.dwmSetWindowAttribute || iconicPixmapNotificationsEnabled() == enabled) + if (iconicPixmapNotificationsEnabled() == enabled) return; QtDwmApiDll::setBooleanWindowAttribute(hwnd, dWMWA_FORCE_ICONIC_REPRESENTATION, enabled); QtDwmApiDll::setBooleanWindowAttribute(hwnd, dWMWA_HAS_ICONIC_BITMAP, enabled); |