diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-25 17:22:09 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-28 15:37:11 +0100 |
| commit | 305ddbeb5ba21e1a976106a2b9fd59252d750c61 (patch) | |
| tree | f5f9bde08bf8b12cbf69a6350d807955d8b3a1e2 /src/tools | |
| parent | 26b1cf2bbaa5a847f8b03137f666b7f32b16d843 (diff) | |
Use Qt::SplitBehavior in preference to QString::SplitBehavior
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: I399b5ea56e9255e775ca1746632f7421519a6616
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 4 | ||||
| -rw-r--r-- | src/tools/tracegen/provider.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 3d378024c9..97e5c9eb69 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -896,7 +896,7 @@ bool readInputFile(Options *options) { const QJsonValue extraLibs = jsonObject.value(QLatin1String("android-extra-libs")); if (!extraLibs.isUndefined()) - options->extraLibs = extraLibs.toString().split(QLatin1Char(','), QString::SkipEmptyParts); + options->extraLibs = extraLibs.toString().split(QLatin1Char(','), Qt::SkipEmptyParts); } { @@ -980,7 +980,7 @@ bool readInputFile(Options *options) } { const QJsonValue qrcFiles = jsonObject.value(QLatin1String("qrcFiles")); - options->qrcFiles = qrcFiles.toString().split(QLatin1Char(','), QString::SkipEmptyParts); + options->qrcFiles = qrcFiles.toString().split(QLatin1Char(','), Qt::SkipEmptyParts); } options->packageName = packageNameFromAndroidManifest(options->androidSourceDirectory + QLatin1String("/AndroidManifest.xml")); if (options->packageName.isEmpty()) diff --git a/src/tools/tracegen/provider.cpp b/src/tools/tracegen/provider.cpp index 39633efe5d..7dfa6a86d6 100644 --- a/src/tools/tracegen/provider.cpp +++ b/src/tools/tracegen/provider.cpp @@ -296,8 +296,7 @@ Provider parseProvider(const QString &filename) if (tracedef.exactMatch(line)) { const QString name = tracedef.cap(1); const QString argsString = tracedef.cap(2); - const QStringList args = argsString.split(QLatin1Char(','), - QString::SkipEmptyParts); + const QStringList args = argsString.split(QLatin1Char(','), Qt::SkipEmptyParts); provider.tracepoints << parseTracepoint(name, args, filename, lineNumber); } else { |