diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:08:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:57:04 +0200 |
| commit | 2b6b4b7d90c7822a90e0e9c92ee812c897e709e1 (patch) | |
| tree | 88aff651b7063cd60f9a7e74959705109c37f7bb /src | |
| parent | 17585323dda73309a915baa93807ad5b8c5a5e7c (diff) | |
| parent | d48526dd4d2bb7a89c177e7cd4a38c3b879b9117 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I9d0194df6bda533c8b9855f87e5ae2ad39ebca87
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/winextras/winextras.pro | 2 | ||||
| -rw-r--r-- | src/winextras/qwinjumplist.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
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. |