diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:25:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 14:07:37 +0200 |
| commit | a56d14f97c4b5aac1ab1cd3e95ce763452ea3e34 (patch) | |
| tree | 4fcf92fddc5496802e9c0a34e81bea7fcc579834 | |
| parent | 4cccbfae21b98afb0cebbce8f586f08e3bef3e52 (diff) | |
| parent | fe63ea126822fae40db90a06ab3be47700e85ec4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I26b1b6de8dc0798d707cb8adce8530238a4d1d98
| -rw-r--r-- | dist/changes-5.9.1 | 24 | ||||
| -rw-r--r-- | src/winextras/qwinjumplist.cpp | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 new file mode 100644 index 0000000..e0a6a4b --- /dev/null +++ b/dist/changes-5.9.1 @@ -0,0 +1,24 @@ +Qt 5.9.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp index 12fa2e5..94b8e81 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -41,7 +41,7 @@ #include <QtCore/QtGlobal> #ifdef Q_CC_MINGW // MinGW: Enable SHCreateItemFromParsingName() -# if defined(_WIN32_IE) && _WIN32_IE << 0x0700 // _WIN32_IE_IE70 +# if defined(_WIN32_IE) && _WIN32_IE < 0x0700 // _WIN32_IE_IE70 # undef _WIN32_IE # endif # ifndef _WIN32_IE |