From 9305a4e5db9ce26db9a2510f5230636122d98ffe Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 25 Jan 2017 14:14:21 +0100
Subject: Fix build of the QML import with -no-opengl

Add -luser32 in that case.

Task-number: QTBUG-58415
Change-Id: I052dac8b44409f60b461e93f463d0e4854718a57
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/imports/winextras/winextras.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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)
-- 
cgit v1.2.3


From 7be0ff7fe32ef01839de4ad0a8142ca05438b500 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@edeltech.ch>
Date: Sun, 12 Mar 2017 22:20:57 +0100
Subject: Migrate to QRegularExpression

This patch updates the code base to use QRegularExpression in the place
of the deprecated QRegExp class.

Change-Id: I884282c3ee59db8742b7883a7815a55b529029a0
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 src/winextras/qwinjumplist.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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.
-- 
cgit v1.2.3