diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-25 15:31:24 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-03-02 15:57:47 +0100 |
commit | 36300dd06bb8191800ec93ca5a408f39b1f221eb (patch) | |
tree | bd8373ac63c9abdf8476922c7dfda1c9f6324a33 | |
parent | 3a358430efe797fe1c0f1aa7f701f9139a642d6f (diff) | |
download | qtscript-36300dd06bb8191800ec93ca5a408f39b1f221eb.tar.gz |
Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.
Change-Id: I10d928ac4368e07a52a92ef92bf501ba28d9b667
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-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 62eb721..c2626f3 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); |