diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 17:05:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-05 07:44:02 +0000 |
| commit | dee746479a701828c01efc91b507ef279dc0f476 (patch) | |
| tree | 89fef4381850f38a21ed39182e59ef22b2fc8a00 /src | |
| parent | 273aae95174aaf243fa91c5f5a6761e950ba8b03 (diff) | |
Raise minimum supported MSVC version to 2015
Remove code for older versions and streamline #ifdefs.
Task-number: QTBUG-51673
Change-Id: Id16d53d4342691e1e01913c2aec3a252dddbdadb
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
| -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 |