diff options
-rw-r--r-- | src/winextras/qwinthumbnailtoolbar.cpp | 5 | ||||
-rw-r--r-- | src/winextras/winshobjidl_p.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp index f09eb15..39622d1 100644 --- a/src/winextras/qwinthumbnailtoolbar.cpp +++ b/src/winextras/qwinthumbnailtoolbar.cpp @@ -470,7 +470,6 @@ inline HWND QWinThumbnailToolBarPrivate::handle() const void QWinThumbnailToolBarPrivate::initToolbar() { -#if !defined(_MSC_VER) || _MSC_VER >= 1600 if (!pTbList || !window) return; THUMBBUTTON buttons[windowsLimitedThumbbarSize]; @@ -478,10 +477,6 @@ void QWinThumbnailToolBarPrivate::initToolbar() HRESULT hresult = pTbList->ThumbBarAddButtons(handle(), 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() diff --git a/src/winextras/winshobjidl_p.h b/src/winextras/winshobjidl_p.h index 93abea0..efd28c6 100644 --- a/src/winextras/winshobjidl_p.h +++ b/src/winextras/winshobjidl_p.h @@ -229,7 +229,7 @@ public: #endif -#if (defined _MSC_VER && _MSC_VER < 1600) || defined(Q_CC_MINGW) +#ifdef Q_CC_MINGW # if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 301 |