diff options
| author | hjk <hjk@qt.io> | 2020-06-18 09:44:44 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-06-18 09:12:12 +0000 |
| commit | 938f81c6012dd1556c8c0442b961e0e6256b83db (patch) | |
| tree | d14c51bf15ce2f58e5edb09b05a75e9b9d139559 /src/libs/utils/consoleprocess.cpp | |
| parent | 8eac3fba8093750f4dfe6b8ab01f7f998fcadd26 (diff) | |
More Qt 6 porting
Task-number: QTCREATORBUG-24098
Change-Id: I8d118e75021996127344e75dffe263cebd95a5b8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/utils/consoleprocess.cpp')
| -rw-r--r-- | src/libs/utils/consoleprocess.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index 265610cc190..b0b684428ae 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -34,11 +34,11 @@ #include <QAbstractEventDispatcher> #include <QCoreApplication> -#include <QCoreApplication> #include <QDir> #include <QFileInfo> #include <QLocalServer> #include <QLocalSocket> +#include <QRegularExpression> #include <QSettings> #include <QTemporaryFile> #include <QTimer> @@ -283,8 +283,8 @@ static QString quoteWinArgument(const QString &arg) QString ret(arg); // Quotes are escaped and their preceding backslashes are doubled. - ret.replace(QRegExp(QLatin1String("(\\\\*)\"")), QLatin1String("\\1\\1\\\"")); - if (ret.contains(QRegExp(QLatin1String("\\s")))) { + ret.replace(QRegularExpression("(\\\\*)\""), "\\1\\1\\\""); + if (ret.contains(QRegularExpression("\\s"))) { // The argument must not end with a \ since this would be interpreted // as escaping the quote -- rather put the \ behind the quote: e.g. // rather use "foo"\ than "foo\" |