diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | src/winextras/qwinjumplistcategory.cpp | 4 | ||||
| -rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 21 | ||||
| -rw-r--r-- | src/winextras/qwinthumbnailtoolbar_p.h | 4 |
5 files changed, 23 insertions, 10 deletions
diff --git a/.qmake.conf b/.qmake.conf index 5d8fd36..16328b7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.2.2 +MODULE_VERSION = 5.3.0 diff --git a/src/src.pro b/src/src.pro index 5d8fdba..ef8ad17 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,4 @@ -win32 { +!winrt:win32 { TEMPLATE = subdirs CONFIG += ordered SUBDIRS += winextras diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp index 4ca815e..8f1f6b0 100644 --- a/src/winextras/qwinjumplistcategory.cpp +++ b/src/winextras/qwinjumplistcategory.cpp @@ -50,6 +50,10 @@ #include <shlobj.h> +#if defined(_MSC_VER) && _MSC_VER < 1600 +# define SHARD_APPIDINFOLINK 0x7L +#endif + QT_BEGIN_NAMESPACE /*! diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index c1f0f2c..baa4d7c 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -55,6 +55,10 @@ #include "qwinfunctions.h" #include "qwineventfilter_p.h" +#ifndef THBN_CLICKED +# define THBN_CLICKED 0x1800 +#endif + QT_BEGIN_NAMESPACE static const int windowsLimitedThumbbarSize = 7; @@ -250,6 +254,7 @@ QWinThumbnailToolBarPrivate::~QWinThumbnailToolBarPrivate() void QWinThumbnailToolBarPrivate::initToolbar() { +#if !defined(_MSC_VER) || _MSC_VER >= 1600 if (!pTbList || !window) return; THUMBBUTTON buttons[windowsLimitedThumbbarSize]; @@ -257,6 +262,10 @@ void QWinThumbnailToolBarPrivate::initToolbar() HRESULT hresult = pTbList->ThumbBarAddButtons(reinterpret_cast<HWND>(window->winId()), windowsLimitedThumbbarSize, buttons); if (FAILED(hresult)) qWarning() << msgComFailed("ThumbBarAddButtons", hresult); +#else + // ITaskbarList3::ThumbBarAddButtons() has a different signature in SDK 6.X + Q_UNIMPLEMENTED(); +#endif } void QWinThumbnailToolBarPrivate::clearToolbar() @@ -281,8 +290,8 @@ void QWinThumbnailToolBarPrivate::_q_updateToolbar() // filling from the right fixes some strange bug which makes last button bg look like first btn bg for (int i = (windowsLimitedThumbbarSize - thumbbarSize); i < windowsLimitedThumbbarSize; i++) { QWinThumbnailToolButton *button = buttonList.at(i - (windowsLimitedThumbbarSize - thumbbarSize)); - buttons[i].dwFlags = makeNativeButtonFlags(button); - buttons[i].dwMask = makeButtonMask(button); + buttons[i].dwFlags = static_cast<THUMBBUTTONFLAGS>(makeNativeButtonFlags(button)); + buttons[i].dwMask = static_cast<THUMBBUTTONMASK>(makeButtonMask(button)); if (!button->icon().isNull()) {; buttons[i].hIcon = QtWin::toHICON(button->icon().pixmap(GetSystemMetrics(SM_CXSMICON))); if (!buttons[i].hIcon) @@ -340,9 +349,9 @@ void QWinThumbnailToolBarPrivate::initButtons(THUMBBUTTON *buttons) } } -THUMBBUTTONFLAGS QWinThumbnailToolBarPrivate::makeNativeButtonFlags(const QWinThumbnailToolButton *button) +int QWinThumbnailToolBarPrivate::makeNativeButtonFlags(const QWinThumbnailToolButton *button) { - THUMBBUTTONFLAGS nativeFlags = (THUMBBUTTONFLAGS)0; + int nativeFlags = 0; if (button->isEnabled()) nativeFlags |= THBF_ENABLED; else @@ -358,9 +367,9 @@ THUMBBUTTONFLAGS QWinThumbnailToolBarPrivate::makeNativeButtonFlags(const QWinTh return nativeFlags; } -THUMBBUTTONMASK QWinThumbnailToolBarPrivate::makeButtonMask(const QWinThumbnailToolButton *button) +int QWinThumbnailToolBarPrivate::makeButtonMask(const QWinThumbnailToolButton *button) { - THUMBBUTTONMASK mask = (THUMBBUTTONMASK)0; + int mask = 0; mask |= THB_FLAGS; if (!button->icon().isNull()) mask |= THB_ICON; diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h index 27b8c1c..b799d7c 100644 --- a/src/winextras/qwinthumbnailtoolbar_p.h +++ b/src/winextras/qwinthumbnailtoolbar_p.h @@ -67,8 +67,8 @@ public: virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; static void initButtons(THUMBBUTTON *buttons); - static THUMBBUTTONFLAGS makeNativeButtonFlags(const QWinThumbnailToolButton *button); - static THUMBBUTTONMASK makeButtonMask(const QWinThumbnailToolButton *button); + static int makeNativeButtonFlags(const QWinThumbnailToolButton *button); + static int makeButtonMask(const QWinThumbnailToolButton *button); static void freeButtonResources(THUMBBUTTON *buttons); static QString msgComFailed(const char *function, HRESULT hresult); |