Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev

4 files changed, 47 insertions, 2 deletions

diff --git a/dist/changes-5.8.0 b/dist/changes-5.8.0
new file mode 100644
index 0000000..91a1b8d
--- /dev/null
+++ b/dist/changes-5.8.0
@@ -0,0 +1,22 @@
+Qt 5.8 introduces many new features and improvements as well as bugfixes
+over the 5.7.x series. 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.8 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.7 will continue to run with 5.8.
+
+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/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 0000000..5026982
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,22 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. 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/imports/winextras/winextras.pro b/src/imports/winextras/winextras.pro
index 0d6ec55..19f8d2b 100644
--- a/src/imports/winextras/winextras.pro
+++ b/src/imports/winextras/winextras.pro
@@ -41,6 +41,6 @@ OTHER_FILES += \
     JumpListDestination.qml \
     JumpListSeparator.qml
 
-qtConfig(dynamicgl):LIBS_PRIVATE += -luser32
+!qtHaveModule(opengl)|qtConfig(dynamicgl):LIBS_PRIVATE += -luser32
 
 load(qml_plugin)
diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp
index a277a74..12fa2e5 100644
--- a/src/winextras/qwinjumplist.cpp
+++ b/src/winextras/qwinjumplist.cpp
@@ -60,6 +60,7 @@
 #include <QDir>
 #include <QtCore/QDebug>
 #include <QCoreApplication>
+#include <QRegularExpression>
 #include <qt_windows.h>
 #include <propvarutil.h>
 
@@ -95,7 +96,7 @@ static QString createArguments(const QStringList &arguments)
     for (int i=0; i<arguments.size(); ++i) {
         QString tmp = arguments.at(i);
         // Quotes are escaped and their preceding backslashes are doubled.
-        tmp.replace(QRegExp(QLatin1String("(\\\\*)\"")), QLatin1String("\\1\\1\\\""));
+        tmp.replace(QRegularExpression(QLatin1String("(\\\\*)\"")), QLatin1String("\\1\\1\\\""));
         if (tmp.isEmpty() || tmp.contains(QLatin1Char(' ')) || tmp.contains(QLatin1Char('\t'))) {
             // The argument must not end with a \ since this would be interpreted
             // as escaping the quote -- rather put the \ behind the quote: e.g.