diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:03:06 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:03:06 +0100 |
commit | f308e917cb0ce05c8c7801299471d68d2344d81c (patch) | |
tree | 54f85babcaf4bf1b86d371136af3f290b61c6a3a | |
parent | c67a652f365a528b6c93c7c9c2d25df5570bf002 (diff) | |
parent | 36300dd06bb8191800ec93ca5a408f39b1f221eb (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I37ffab5c5cf7c0898e1fa2b291cb7d95120fa25e
-rw-r--r-- | examples/script/qsdbg/scriptdebugger.cpp | 2 | ||||
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggerconsole.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qscriptv8testsuite/abstracttestsuite.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/script/qsdbg/scriptdebugger.cpp b/examples/script/qsdbg/scriptdebugger.cpp index 479c26d..81ab8c1 100644 --- a/examples/script/qsdbg/scriptdebugger.cpp +++ b/examples/script/qsdbg/scriptdebugger.cpp @@ -355,7 +355,7 @@ void ScriptDebuggerPrivate::interactive() else m_lastInteractiveCommand = line; - QStringList parts = line.split(QLatin1Char(' '), QString::SkipEmptyParts); + QStringList parts = line.split(QLatin1Char(' '), Qt::SkipEmptyParts); if (!parts.isEmpty()) { QString command = parts.takeFirst().mid(1); if (executeCommand(command, parts)) diff --git a/src/scripttools/debugging/qscriptdebuggerconsole.cpp b/src/scripttools/debugging/qscriptdebuggerconsole.cpp index 9968411..d5bdf75 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsole.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsole.cpp @@ -404,7 +404,7 @@ QScriptDebuggerConsoleCommandJob *QScriptDebuggerConsolePrivate::createJob( if (!tmp.isEmpty()) args.append(tmp); } else { - args = tmp.split(QLatin1Char(' '), QString::SkipEmptyParts); + args = tmp.split(QLatin1Char(' '), Qt::SkipEmptyParts); } return cmd->createJob(args, q_func(), messageHandler, commandScheduler); } diff --git a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp index b79e4ec..3fb1e59 100644 --- a/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp +++ b/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp @@ -150,7 +150,7 @@ void TestConfigParser::parse(const QString &path, } } else { if (predicate.isEmpty() || isDefined(predicate)) { - QStringList parts = line.split(separator, QString::KeepEmptyParts); + QStringList parts = line.split(separator, Qt::KeepEmptyParts); for (int i = 0; i < parts.size(); ++i) parts[i] = unescape(parts[i]); client->configData(mode, parts); |