aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@edeltech.ch>2017-03-12 22:20:57 +0100
committerSamuel Gaist <samuel.gaist@edeltech.ch>2017-03-13 20:56:16 +0000
commit7be0ff7fe32ef01839de4ad0a8142ca05438b500 (patch)
tree0f0e0d89ac2c173470425920c22e3570e7a369e0
parent5ee8cb180c182e00ca2520f2da28535c9ce117d3 (diff)
Migrate to QRegularExpressionv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1
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>
-rw-r--r--src/winextras/qwinjumplist.cpp3
1 files changed, 2 insertions, 1 deletions
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.