All: Use Utils::SkipEmptyParts

Task-number: QTCREATORBUG-24098
Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

65 files changed, 229 insertions, 149 deletions

diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index af54f289ca..b146e235e8 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -27,6 +27,7 @@
 
 #include "algorithm.h"
 #include "qtcassert.h"
+#include "stringutils.h"
 
 #include <QDebug>
 #include <QDir>
@@ -303,7 +304,7 @@ FilePaths Environment::path() const
 FilePaths Environment::pathListValue(const QString &varName) const
 {
     const QStringList pathComponents = expandedValueForKey(varName)
-            .split(OsSpecificAspects::pathListSeparator(m_osType), QString::SkipEmptyParts);
+            .split(OsSpecificAspects::pathListSeparator(m_osType), Utils::SkipEmptyParts);
     return transform(pathComponents, &FilePath::fromUserInput);
 }
 
diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp
index 8d9c7b9f1a..175e4e3a6c 100644
--- a/src/libs/utils/fileinprojectfinder.cpp
+++ b/src/libs/utils/fileinprojectfinder.cpp
@@ -30,6 +30,7 @@
 #include "hostosinfo.h"
 #include "qrcparser.h"
 #include "qtcassert.h"
+#include "stringutils.h"
 
 #include <QCursor>
 #include <QDebug>
@@ -121,7 +122,7 @@ void FileInProjectFinder::setSysroot(const FilePath &sysroot)
 
 void FileInProjectFinder::addMappedPath(const FilePath &localFilePath, const QString &remoteFilePath)
 {
-    const QStringList segments = remoteFilePath.split('/', QString::SkipEmptyParts);
+    const QStringList segments = remoteFilePath.split('/', Utils::SkipEmptyParts);
 
     PathMappingNode *node = &m_pathMapRoot;
     for (const QString &segment : segments) {
@@ -191,7 +192,7 @@ bool FileInProjectFinder::findFileOrDirectory(const QString &originalPath, FileH
         return false;
     }
 
-    const auto segments = originalPath.splitRef('/', QString::SkipEmptyParts);
+    const auto segments = originalPath.splitRef('/', Utils::SkipEmptyParts);
     const PathMappingNode *node = &m_pathMapRoot;
     for (const auto &segment : segments) {
         auto it = node->children.find(segment.toString());
diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp
index 522ea76bc5..6e0be7aa3c 100644
--- a/src/libs/utils/pathlisteditor.cpp
+++ b/src/libs/utils/pathlisteditor.cpp
@@ -26,17 +26,17 @@
 #include "pathlisteditor.h"
 
 #include "hostosinfo.h"
+#include "stringutils.h"
 
-#include <QVBoxLayout>
-#include <QPlainTextEdit>
+#include <QDebug>
 #include <QFileDialog>
-#include <QTextBlock>
 #include <QMenu>
-
 #include <QMimeData>
-#include <QSharedPointer>
-#include <QDebug>
+#include <QPlainTextEdit>
 #include <QPushButton>
+#include <QSharedPointer>
+#include <QTextBlock>
+#include <QVBoxLayout>
 
 /*!
     \class Utils::PathListEditor
@@ -166,7 +166,7 @@ QStringList PathListEditor::pathList() const
     if (text.isEmpty())
         return QStringList();
     // trim each line
-    QStringList rc = text.split(QLatin1Char('\n'), QString::SkipEmptyParts);
+    QStringList rc = text.split('\n', Utils::SkipEmptyParts);
     const QStringList::iterator end = rc.end();
     for (QStringList::iterator it = rc.begin(); it != end; ++it)
         *it = it->trimmed();
@@ -184,7 +184,7 @@ void PathListEditor::setPathList(const QString &pathString)
         clear();
     } else {
         setPathList(pathString.split(HostOsInfo::pathListSeparator(),
-                QString::SkipEmptyParts));
+                                     Utils::SkipEmptyParts));
     }
 }
 
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 4e34cbba84..aaab927e65 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -36,26 +36,31 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
-#include <projectexplorer/kitmanager.h>
-#include <projectexplorer/kitinformation.h>
+
 #include <projectexplorer/devicesupport/devicemanager.h>
+#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/toolchainmanager.h>
 #include <projectexplorer/session.h>
+#include <projectexplorer/toolchainmanager.h>
+
 #include <debugger/debuggeritemmanager.h>
 #include <debugger/debuggeritem.h>
 #include <debugger/debuggerkitinformation.h>
+
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtversionmanager.h>
+
 #include <utils/algorithm.h>
 #include <utils/environment.h>
+#include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/persistentsettings.h>
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
-#include <utils/environment.h>
 
 #include <QApplication>
 #include <QDirIterator>
@@ -612,7 +617,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(const FilePath &adbTo
                 .arg(cmd.toUserOutput());
         return devices;
     }
-    QStringList adbDevs = response.allOutput().split('\n', QString::SkipEmptyParts);
+    QStringList adbDevs = response.allOutput().split('\n', Utils::SkipEmptyParts);
     if (adbDevs.empty())
         return devices;
 
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 9bc32babc3..d00d275ae3 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -52,6 +52,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 
 #include <QApplication>
@@ -145,7 +146,7 @@ bool AndroidManager::packageInstalled(const QString &deviceSerial,
     QStringList args = AndroidDeviceInfo::adbSelector(deviceSerial);
     args << "shell" << "pm" << "list" << "packages";
     QStringList lines = runAdbCommand(args).stdOut().split(QRegularExpression("[\\n\\r]"),
-                                                           QString::SkipEmptyParts);
+                                                           Utils::SkipEmptyParts);
     for (const QString &line : lines) {
         // Don't want to confuse com.abc.xyz with com.abc.xyz.def so check with
         // endsWith
diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 549f0d1871..3d6042a213 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -41,13 +41,14 @@
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtkitinformation.h>
 
+#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 #include <utils/temporaryfile.h>
-#include <utils/qtcprocess.h>
 #include <utils/url.h>
-#include <utils/fileutils.h>
 
 #include <QDir>
 #include <QDirIterator>
@@ -509,7 +510,7 @@ void AndroidRunnerWorker::asyncStartHelper()
     }
 
     for (const QString &entry : m_beforeStartAdbCommands)
-        runAdb(entry.split(' ', QString::SkipEmptyParts));
+        runAdb(entry.split(' ', Utils::SkipEmptyParts));
 
     QStringList args({"shell", "am", "start"});
     args << m_amStartExtraArgs;
@@ -778,7 +779,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)
 
         // Run adb commands after application quit.
         for (const QString &entry: m_afterFinishAdbCommands)
-            runAdb(entry.split(' ', QString::SkipEmptyParts));
+            runAdb(entry.split(' ', Utils::SkipEmptyParts));
     } else {
         // In debugging cases this will be funneled to the engine to actually start
         // and attach gdb. Afterwards this ends up in handleRemoteDebuggerRunning() below.
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 0dc7a67ba8..8e2115db86 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -22,6 +22,7 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
+
 #include "androidsdkmanager.h"
 
 #include "androidconstants.h"
@@ -30,9 +31,10 @@
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 #include <utils/runextensions.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
-#include <utils/qtcprocess.h>
 
 #include <QFutureWatcher>
 #include <QLoggingCategory>
@@ -107,7 +109,7 @@ int parseProgress(const QString &out, bool &foundAssertion)
     if (out.isEmpty())
         return progress;
     QRegularExpression reg("(?<progress>\\d*)%");
-    QStringList lines = out.split(QRegularExpression("[\\n\\r]"), QString::SkipEmptyParts);
+    QStringList lines = out.split(QRegularExpression("[\\n\\r]"), Utils::SkipEmptyParts);
     for (const QString &line : lines) {
         QRegularExpressionMatch match = reg.match(line);
         if (match.hasMatch()) {
diff --git a/src/plugins/autotest/boost/boosttestconfiguration.cpp b/src/plugins/autotest/boost/boosttestconfiguration.cpp
index e38243a89f..dfb0cb78a7 100644
--- a/src/plugins/autotest/boost/boosttestconfiguration.cpp
+++ b/src/plugins/autotest/boost/boosttestconfiguration.cpp
@@ -32,6 +32,8 @@
 #include "../itestframework.h"
 #include "../testsettings.h"
 
+#include <utils/stringutils.h>
+
 namespace Autotest {
 namespace Internal {
 
@@ -126,7 +128,7 @@ QStringList BoostTestConfiguration::argumentsForTestRunner(QStringList *omitted)
 
     if (AutotestPlugin::settings()->processArgs) {
         arguments << filterInterfering(runnable().commandLineArguments.split(
-                                           ' ', QString::SkipEmptyParts), omitted);
+                                           ' ', Utils::SkipEmptyParts), omitted);
     }
     return arguments;
 }
diff --git a/src/plugins/autotest/catch/catchconfiguration.cpp b/src/plugins/autotest/catch/catchconfiguration.cpp
index f314ef49bb..e9e957a143 100644
--- a/src/plugins/autotest/catch/catchconfiguration.cpp
+++ b/src/plugins/autotest/catch/catchconfiguration.cpp
@@ -30,6 +30,8 @@
 #include "../itestframework.h"
 #include "../testsettings.h"
 
+#include <utils/stringutils.h>
+
 namespace Autotest {
 namespace Internal {
 
@@ -99,7 +101,7 @@ QStringList CatchConfiguration::argumentsForTestRunner(QStringList *omitted) con
 
     if (AutotestPlugin::settings()->processArgs) {
         arguments << filterInterfering(runnable().commandLineArguments.split(
-                                           ' ', QString::SkipEmptyParts), omitted);
+                                           ' ', Utils::SkipEmptyParts), omitted);
     }
 
     auto settings = dynamic_cast<CatchTestSettings *>(framework()->frameworkSettings());
diff --git a/src/plugins/autotest/gtest/gtestconfiguration.cpp b/src/plugins/autotest/gtest/gtestconfiguration.cpp
index 615ddcd3da..13cbebc246 100644
--- a/src/plugins/autotest/gtest/gtestconfiguration.cpp
+++ b/src/plugins/autotest/gtest/gtestconfiguration.cpp
@@ -32,6 +32,7 @@
 #include "../testsettings.h"
 
 #include <utils/algorithm.h>
+#include <utils/stringutils.h>
 
 namespace Autotest {
 namespace Internal {
@@ -76,7 +77,7 @@ QStringList GTestConfiguration::argumentsForTestRunner(QStringList *omitted) con
     QStringList arguments;
     if (AutotestPlugin::settings()->processArgs) {
         arguments << filterInterfering(runnable().commandLineArguments.split(
-                                           ' ', QString::SkipEmptyParts), omitted);
+                                           ' ', Utils::SkipEmptyParts), omitted);
     }
 
     const QStringList &testSets = testCases();
diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp
index f2821ca1bf..8b5c9eafc7 100644
--- a/src/plugins/autotest/gtest/gtesttreeitem.cpp
+++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp
@@ -32,9 +32,11 @@
 
 #include <cpptools/cppmodelmanager.h>
 #include <projectexplorer/session.h>
+
 #include <utils/algorithm.h>
 #include <utils/icon.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/theme/theme.h>
 
 #include <QRegularExpression>
@@ -91,10 +93,10 @@ static bool matchesFilter(const QString &filter, const QString &fullTestName)
     QStringList negative;
     int startOfNegative = filter.indexOf('-');
     if (startOfNegative == -1) {
-        positive.append(filter.split(':', QString::SkipEmptyParts));
+        positive.append(filter.split(':', Utils::SkipEmptyParts));
     } else {
-        positive.append(filter.left(startOfNegative).split(':', QString::SkipEmptyParts));
-        negative.append(filter.mid(startOfNegative + 1).split(':', QString::SkipEmptyParts));
+        positive.append(filter.left(startOfNegative).split(':', Utils::SkipEmptyParts));
+        negative.append(filter.mid(startOfNegative + 1).split(':', Utils::SkipEmptyParts));
     }
 
     QString testName = fullTestName;
diff --git a/src/plugins/autotest/qtest/qttestconfiguration.cpp b/src/plugins/autotest/qtest/qttestconfiguration.cpp
index a3bc92c67c..30a707ebab 100644
--- a/src/plugins/autotest/qtest/qttestconfiguration.cpp
+++ b/src/plugins/autotest/qtest/qttestconfiguration.cpp
@@ -32,6 +32,8 @@
 #include "../itestframework.h"
 #include "../testsettings.h"
 
+#include <utils/stringutils.h>
+
 namespace Autotest {
 namespace Internal {
 
@@ -50,7 +52,7 @@ QStringList QtTestConfiguration::argumentsForTestRunner(QStringList *omitted) co
     QStringList arguments;
     if (AutotestPlugin::settings()->processArgs) {
         arguments.append(QTestUtils::filterInterfering(
-                             runnable().commandLineArguments.split(' ', QString::SkipEmptyParts),
+                             runnable().commandLineArguments.split(' ', Utils::SkipEmptyParts),
                              omitted, false));
     }
     auto qtSettings = dynamic_cast<QtTestSettings *>(framework()->frameworkSettings());
diff --git a/src/plugins/autotest/quick/quicktestconfiguration.cpp b/src/plugins/autotest/quick/quicktestconfiguration.cpp
index e61c4f12d8..22abcb5df5 100644
--- a/src/plugins/autotest/quick/quicktestconfiguration.cpp
+++ b/src/plugins/autotest/quick/quicktestconfiguration.cpp
@@ -32,6 +32,8 @@
 #include "../itestframework.h"
 #include "../testsettings.h"
 
+#include <utils/stringutils.h>
+
 namespace Autotest {
 namespace Internal {
 
@@ -57,7 +59,7 @@ QStringList QuickTestConfiguration::argumentsForTestRunner(QStringList *omitted)
     QStringList arguments;
     if (AutotestPlugin::settings()->processArgs) {
         arguments.append(QTestUtils::filterInterfering
-                         (runnable().commandLineArguments.split(' ', QString::SkipEmptyParts),
+                         (runnable().commandLineArguments.split(' ', Utils::SkipEmptyParts),
                           omitted, true));
     }
 
diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp
index 8c379ee823..add1a9cc65 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp
+++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp
@@ -29,6 +29,7 @@
 
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
+#include <utils/stringutils.h>
 
 #include <QDir>
 #include <QFile>
@@ -375,7 +376,7 @@ QStringList MakefileParser::targetValues(bool *hasVariables)
         // Get all values of a line separated by spaces.
         // Values representing a variable like $(value) get
         // removed currently.
-        QStringList lineValues = m_line.split(QLatin1Char(' '), QString::SkipEmptyParts);
+        QStringList lineValues = m_line.split(QLatin1Char(' '), Utils::SkipEmptyParts);
         QStringList::iterator it = lineValues.begin();
         while (it != lineValues.end()) {
             if ((*it).startsWith(QLatin1String("$("))) {
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 0ee222b48c..25a3cd94da 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -54,6 +54,7 @@
 
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <vcsbase/basevcseditorfactory.h>
 #include <vcsbase/basevcssubmiteditorfactory.h>
@@ -790,7 +791,7 @@ bool BazaarPluginPrivate::submitEditorAboutToClose()
         //rewrite entries of the form 'file => newfile' to 'newfile' because
         //this would mess the commit command
         for (QStringList::iterator iFile = files.begin(); iFile != files.end(); ++iFile) {
-            const QStringList parts = iFile->split(QLatin1String(" => "), QString::SkipEmptyParts);
+            const QStringList parts = iFile->split(QLatin1String(" => "), Utils::SkipEmptyParts);
             if (!parts.isEmpty())
                 *iFile = parts.last();
         }
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index 83b4e328e9..6926ce8843 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -40,12 +40,16 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/idocument.h>
+
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/projecttree.h>
+
 #include <texteditor/formattexteditor.h>
+
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
+#include <utils/stringutils.h>
 
 #include <QAction>
 #include <QMenu>
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
index 981dd5983b..dfb2c57f91 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
@@ -32,6 +32,7 @@
 #include <coreplugin/icore.h>
 
 #include <utils/runextensions.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 
 #include <QDateTime>
@@ -206,7 +207,7 @@ void ArtisticStyleSettings::createDocumentationFile() const
     for (QString line : lines) {
         line = line.trimmed();
         if ((line.startsWith("--") && !line.startsWith("---")) || line.startsWith("OR ")) {
-            const QStringList rawKeys = line.split(" OR ", QString::SkipEmptyParts);
+            const QStringList rawKeys = line.split(" OR ", Utils::SkipEmptyParts);
             for (QString k : rawKeys) {
                 k = k.trimmed();
                 k.remove('#');
diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp
index d58c4f38b8..e70fcd72ce 100644
--- a/src/plugins/clangtools/diagnosticconfigswidget.cpp
+++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp
@@ -35,6 +35,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDesktopServices>
 #include <QDialogButtonBox>
@@ -308,7 +309,7 @@ public:
         propagateDown(index(0, 0, QModelIndex()));
 
         QStringList checksList = checks.simplified().remove(" ")
-                .split(",", QString::SkipEmptyParts);
+                .split(",", Utils::SkipEmptyParts);
 
         for (QString &check : checksList) {
             Qt::CheckState state;
@@ -857,7 +858,7 @@ void DiagnosticConfigsWidget::syncClazyWidgets(const ClangDiagnosticConfig &conf
     const QStringList checkNames = config.clazyMode()
                                            == ClangDiagnosticConfig::ClazyMode::UseDefaultChecks
                                        ? m_clazyInfo.defaultChecks
-                                       : config.clazyChecks().split(',', QString::SkipEmptyParts);
+                                       : config.clazyChecks().split(',', Utils::SkipEmptyParts);
     m_clazyTreeModel->enableChecks(checkNames);
 
     syncClazyChecksGroupBox();
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 91e9082f94..206fd75089 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -45,21 +45,25 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/infobar.h>
+#include <coreplugin/locator/commandlocator.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/locator/commandlocator.h>
+
 #include <texteditor/textdocument.h>
-#include <projectexplorer/session.h>
+
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
+#include <projectexplorer/session.h>
+
 #include <utils/algorithm.h>
-#include <utils/synchronousprocess.h>
-#include <utils/temporarydirectory.h>
-#include <utils/parameteraction.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
+#include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
+#include <utils/stringutils.h>
+#include <utils/synchronousprocess.h>
+#include <utils/temporarydirectory.h>
 
 #include <vcsbase/basevcseditorfactory.h>
 #include <vcsbase/basevcssubmiteditorfactory.h>
@@ -414,7 +418,7 @@ QStringList ClearCasePluginPrivate::getVobList() const
     const ClearCaseResponse response =
             runCleartool(currentState().topLevel(), args, m_settings.timeOutS, SilentRun);
 
-    return response.stdOut.split(QLatin1Char('\n'), QString::SkipEmptyParts);
+    return response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
 }
 
 /// Get the drive letter of a path
@@ -541,7 +545,7 @@ QString ClearCasePluginPrivate::ccManagesDirectory(const QString &directory) con
     if (response.error)
         return QString();
 
-    const QStringList result = response.stdOut.split(QLatin1Char('\n'), QString::SkipEmptyParts);
+    const QStringList result = response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
     if (result.size() != 2)
         return QString();
 
@@ -890,7 +894,7 @@ QStringList ClearCasePluginPrivate::ccGetActiveVobs() const
         prefix += QLatin1Char('/');
 
     const QDir theViewRootDir(theViewRoot);
-    foreach (const QString &line, response.stdOut.split(QLatin1Char('\n'), QString::SkipEmptyParts)) {
+    foreach (const QString &line, response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts)) {
         const bool isActive = line.at(0) == QLatin1Char('*');
         if (!isActive)
             continue;
@@ -2051,7 +2055,7 @@ QList<QStringPair> ClearCasePluginPrivate::ccGetActivities() const
     QStringList args(QLatin1String("lsactivity"));
     args << QLatin1String("-fmt") << QLatin1String("%n\\t%[headline]p\\n");
     const QString response = runCleartoolSync(currentState().topLevel(), args);
-    QStringList acts = response.split(QLatin1Char('\n'), QString::SkipEmptyParts);
+    QStringList acts = response.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
     foreach (const QString &activity, acts) {
         QStringList act = activity.split(QLatin1Char('\t'));
         if (act.size() >= 2)
@@ -2342,7 +2346,7 @@ QString ClearCasePluginPrivate::runExtDiff(const QString &workingDir, const QStr
                                     int timeOutS, QTextCodec *outputCodec)
 {
     CommandLine diff("diff");
-    diff.addArgs(m_settings.diffArgs.split(' ', QString::SkipEmptyParts));
+    diff.addArgs(m_settings.diffArgs.split(' ', Utils::SkipEmptyParts));
     diff.addArgs(arguments);
 
     SynchronousProcess process;
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 7a755a4a03..f52cf7c28f 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -41,11 +41,13 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmacroexpander.h>
 #include <projectexplorer/target.h>
+
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtbuildaspects.h>
 #include <qtsupport/qtkitinformation.h>
 
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDir>
 #include <QLoggingCategory>
@@ -283,13 +285,7 @@ QStringList CMakeBuildConfiguration::extraCMakeArguments() const
 
 QStringList CMakeBuildConfiguration::initialCMakeArguments() const
 {
-    return aspect<InitialCMakeArgumentsAspect>()->value().split('\n',
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-                                                                QString::SkipEmptyParts
-#else
-                                                                Qt::SkipEmptyParts
-#endif
-                                                                );
+    return aspect<InitialCMakeArgumentsAspect>()->value().split('\n', Utils::SkipEmptyParts);
 }
 
 void CMakeBuildConfiguration::setExtraCMakeArguments(const QStringList &args)
diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.cpp b/src/plugins/coreplugin/locator/urllocatorfilter.cpp
index c567e810d7..355804f152 100644
--- a/src/plugins/coreplugin/locator/urllocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/urllocatorfilter.cpp
@@ -25,6 +25,8 @@
 
 #include "urllocatorfilter.h"
 
+#include <utils/stringutils.h>
+
 #include <QDesktopServices>
 #include <QMutexLocker>
 #include <QUrl>
@@ -190,7 +192,7 @@ void UrlLocatorFilter::restoreState(const QByteArray &state)
 
     QString value;
     in >> value;
-    m_remoteUrls = value.split('^', QString::SkipEmptyParts);
+    m_remoteUrls = value.split('^', Utils::SkipEmptyParts);
 
     QString shortcut;
     in >> shortcut;
diff --git a/src/plugins/coreplugin/menubarfilter.cpp b/src/plugins/coreplugin/menubarfilter.cpp
index dc8de54614..6b8181b3ff 100644
--- a/src/plugins/coreplugin/menubarfilter.cpp
+++ b/src/plugins/coreplugin/menubarfilter.cpp
@@ -187,7 +187,7 @@ void Core::Internal::MenuBarFilter::prepareSearch(const QString &entry)
     static const QRegularExpression seperatorRegExp(QString("[%1]").arg(separators));
     QString normalized = entry;
     normalized.replace(seperatorRegExp, separators.at(0));
-    const QStringList entryPath = normalized.split(separators.at(0), QString::SkipEmptyParts);
+    const QStringList entryPath = normalized.split(separators.at(0), Utils::SkipEmptyParts);
     m_entries.clear();
     QVector<const QMenu *> processedMenus;
     for (QAction* action : menuBarActions())
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp
index 83ed2a278b..b179c62424 100644
--- a/src/plugins/coreplugin/mimetypesettings.cpp
+++ b/src/plugins/coreplugin/mimetypesettings.cpp
@@ -37,6 +37,7 @@
 #include <utils/headerviewstretcher.h>
 #include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QAbstractTableModel>
 #include <QCoreApplication>
@@ -381,7 +382,7 @@ void MimeTypeSettingsPrivate::handlePatternEdited()
     const Utils::MimeType mt = m_model->m_mimeTypes.at(index);
     ensurePendingMimeType(mt);
     m_pendingModifiedMimeTypes[mt.name()].globPatterns
-            = m_ui.patternsLineEdit->text().split(kSemiColon, QString::SkipEmptyParts);
+            = m_ui.patternsLineEdit->text().split(kSemiColon, Utils::SkipEmptyParts);
 }
 
 void MimeTypeSettingsPrivate::addMagicHeaderRow(const MagicData &data)
@@ -578,7 +579,7 @@ MimeTypeSettingsPrivate::UserMimeTypeHash MimeTypeSettingsPrivate::readUserModif
                 if (reader.name() == QLatin1String(mimeTypeTagC)) {
                     mt.name = atts.value(QLatin1String(mimeTypeAttributeC)).toString();
                     mt.globPatterns = atts.value(QLatin1String(patternAttributeC)).toString()
-                            .split(kSemiColon, QString::SkipEmptyParts);
+                            .split(kSemiColon, Utils::SkipEmptyParts);
                 } else if (reader.name() == QLatin1String(matchTagC)) {
                     QByteArray value = atts.value(QLatin1String(matchValueAttributeC)).toUtf8();
                     QByteArray typeName = atts.value(QLatin1String(matchTypeAttributeC)).toUtf8();
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index 9673a995f3..c7d11f4d35 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -312,7 +312,7 @@ public:
                         }
 
                         Core::SearchResultItem item;
-                        item.path = scope.split(QLatin1String("::"), QString::SkipEmptyParts);
+                        item.path = scope.split(QLatin1String("::"), Utils::SkipEmptyParts);
                         item.text = text;
                         item.icon = info->icon();
                         item.userData = QVariant::fromValue(info);
diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
index e39fbe2313..3e74b9da2a 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
@@ -30,6 +30,7 @@
 #include "ui_clangbasechecks.h"
 
 #include <utils/executeondestruction.h>
+#include <utils/stringutils.h>
 #include <utils/treemodel.h>
 
 #include <QInputDialog>
@@ -254,7 +255,7 @@ static QString validateDiagnosticOptions(const QStringList &options)
 
 static QStringList normalizeDiagnosticInputOptions(const QString &options)
 {
-    return options.simplified().split(QLatin1Char(' '), QString::SkipEmptyParts);
+    return options.simplified().split(QLatin1Char(' '), Utils::SkipEmptyParts);
 }
 
 void ClangDiagnosticConfigsWidget::onClangOnlyOptionsChanged()
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 68f9242ceb..2f54359458 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -39,16 +39,17 @@
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/mimetypes/mimedatabase.h>
+#include <utils/stringutils.h>
 
-#include <QSettings>
-#include <QDebug>
-#include <QFile>
 #include <QCoreApplication>
 #include <QDate>
+#include <QDebug>
+#include <QFile>
+#include <QFileDialog>
 #include <QLocale>
+#include <QSettings>
 #include <QTextCodec>
 #include <QTextStream>
-#include <QFileDialog>
 
 namespace CppTools {
 namespace Internal {
@@ -308,7 +309,7 @@ void CppFileSettingsWidget::setLicenseTemplatePath(const QString &lp)
 static QStringList trimmedPaths(const QString &paths)
 {
     QStringList res;
-    foreach (const QString &path, paths.split(QLatin1Char(','), QString::SkipEmptyParts))
+    foreach (const QString &path, paths.split(QLatin1Char(','), Utils::SkipEmptyParts))
         res << path.trimmed();
     return res;
 }
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 26bbfffd72..b9de5be52e 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -46,6 +46,7 @@
 #include <utils/synchronousprocess.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
@@ -183,8 +184,7 @@ public:
     QStringList arguments() const override
     {
         QStringList args;
-        args = m_settings.stringValue(CvsSettings::diffOptionsKey).split(QLatin1Char(' '),
-                                                                         QString::SkipEmptyParts);
+        args = m_settings.stringValue(CvsSettings::diffOptionsKey).split(' ', SkipEmptyParts);
         args += VcsBaseEditorConfig::arguments();
         return args;
     }
diff --git a/src/plugins/cvs/cvsutils.cpp b/src/plugins/cvs/cvsutils.cpp
index eac2986039..a73afad6fe 100644
--- a/src/plugins/cvs/cvsutils.cpp
+++ b/src/plugins/cvs/cvsutils.cpp
@@ -25,6 +25,8 @@
 
 #include "cvsutils.h"
 
+#include <utils/stringutils.h>
+
 #include <QRegExp>
 #include <QStringList>
 
@@ -60,7 +62,7 @@ QList<CvsLogEntry> parseLogEntries(const QString &o,
     enum ParseState { FileState, RevisionState, StatusLineState };
 
     QList<CvsLogEntry> rc;
-    const QStringList lines = o.split(QString(QLatin1Char('\n')), QString::SkipEmptyParts);
+    const QStringList lines = o.split('\n', Utils::SkipEmptyParts);
     ParseState state = FileState;
 
     const QString workingFilePrefix = QLatin1String("Working file: ");
@@ -173,7 +175,7 @@ StateList parseStatusOutput(const QString &directory, const QString &output)
     const QString dotDir = QString(QLatin1Char('.'));
     const QChar slash = QLatin1Char('/');
 
-    const QStringList list = output.split(QLatin1Char('\n'), QString::SkipEmptyParts);
+    const QStringList list = output.split('\n', Utils::SkipEmptyParts);
 
     QString path = directory;
     if (!path.isEmpty())
diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp
index f47934af19..84b5a20337 100644
--- a/src/plugins/debugger/breakpoint.cpp
+++ b/src/plugins/debugger/breakpoint.cpp
@@ -31,6 +31,7 @@
 
 #include <projectexplorer/abi.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDebug>
 #include <QFileInfo>
@@ -155,7 +156,7 @@ bool BreakpointParameters::isQmlFileAndLineBreakpoint() const
     if (qmlExtensionString.isEmpty())
         qmlExtensionString = ".qml;.js";
 
-    const auto qmlFileExtensions = qmlExtensionString.splitRef(';', QString::SkipEmptyParts);
+    const auto qmlFileExtensions = qmlExtensionString.splitRef(';', Utils::SkipEmptyParts);
     const QString file = fileName.toString();
     for (const QStringRef &extension : qmlFileExtensions) {
         if (file.endsWith(extension, Qt::CaseInsensitive))
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 056991b06b..50a035a158 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -58,14 +58,15 @@
 #include <projectexplorer/taskhub.h>
 #include <texteditor/texteditor.h>
 
-#include <utils/synchronousprocess.h>
-#include <utils/qtcprocess.h>
-#include <utils/winutils.h>
-#include <utils/qtcassert.h>
-#include <utils/savedaction.h>
 #include <utils/consoleprocess.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
+#include <utils/savedaction.h>
+#include <utils/stringutils.h>
+#include <utils/synchronousprocess.h>
+#include <utils/winutils.h>
 
 #include <cplusplus/findcdbbreakpoint.h>
 #include <cpptools/cppmodelmanager.h>
@@ -2760,7 +2761,7 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
     }
     const QString commands = stringSetting(ExtraDumperCommands);
     if (!commands.isEmpty()) {
-        for (const auto &command : commands.split('\n', QString::SkipEmptyParts))
+        for (const auto &command : commands.split('\n', Utils::SkipEmptyParts))
             runCommand({command, ScriptCommand});
     }
 
diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp
index a0775c2da6..d26c20fbb8 100644
--- a/src/plugins/debugger/debuggeritem.cpp
+++ b/src/plugins/debugger/debuggeritem.cpp
@@ -35,6 +35,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 #include <utils/utilsicons.h>
 #include <utils/winutils.h>
@@ -79,7 +80,7 @@ static QString getConfigurationOfGdbCommand(const FilePath &command)
 static QString extractGdbTargetAbiStringFromGdbOutput(const QString &gdbOutput)
 {
     const auto outputLines = gdbOutput.split('\n');
-    const auto whitespaceSeparatedTokens = outputLines.join(' ').split(' ', QString::SkipEmptyParts);
+    const auto whitespaceSeparatedTokens = outputLines.join(' ').split(' ', Utils::SkipEmptyParts);
 
     const QString targetKey{"--target="};
     const QString targetValue = Utils::findOrDefault(whitespaceSeparatedTokens,
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 11bab647d0..8ec83467b6 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -64,6 +64,7 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/savedaction.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 #include <utils/temporaryfile.h>
 
@@ -2699,7 +2700,7 @@ void GdbEngine::handleShowModuleSections(const DebuggerResponse &response,
                     active = true;
             } else {
                 if (active) {
-                    QStringList items = line.split(' ', QString::SkipEmptyParts);
+                    QStringList items = line.split(' ', Utils::SkipEmptyParts);
                     QString fromTo = items.value(0, QString());
                     const int pos = fromTo.indexOf('-');
                     QTC_ASSERT(pos >= 0, continue);
@@ -3188,7 +3189,7 @@ void GdbEngine::handleRegisterListing(const DebuggerResponse &response)
     m_registers.clear();
     QStringList lines = response.consoleStreamOutput.split('\n');
     for (int i = 1; i < lines.size(); ++i) {
-        const QVector<QStringRef> parts = lines.at(i).splitRef(' ', QString::SkipEmptyParts);
+        const QVector<QStringRef> parts = lines.at(i).splitRef(' ', Utils::SkipEmptyParts);
         if (parts.size() < 7)
             continue;
         int gdbRegisterNumber = parts.at(1).toInt();
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 3775642529..79c6ad4e2f 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -44,8 +44,10 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/session.h>
+
 #include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDesignerFormWindowInterface>
 #include <QDesignerFormEditorInterface>
@@ -382,7 +384,7 @@ static QString addParameterNames(const QString &functionSignature, const QString
     const int lastParen = argumentsString.lastIndexOf(')');
     if (lastParen != -1)
         argumentsString.truncate(lastParen);
-    const QStringList arguments = argumentsString.split(',', QString::SkipEmptyParts);
+    const QStringList arguments = argumentsString.split(',', Utils::SkipEmptyParts);
     const int pCount = parameterNames.count();
     const int aCount = arguments.count();
     for (int i = 0; i < aCount; ++i) {
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp
index 73c7ce5ba8..a49a08f142 100644
--- a/src/plugins/git/branchmodel.cpp
+++ b/src/plugins/git/branchmodel.cpp
@@ -32,6 +32,7 @@
 
 #include <utils/filesystemwatcher.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDateTime>
 #include <QFont>
@@ -647,7 +648,7 @@ bool BranchModel::branchIsMerged(const QModelIndex &idx)
         VcsOutputWindow::appendError(errorMessage);
     }
 
-    const QStringList lines = output.split('\n', QString::SkipEmptyParts);
+    const QStringList lines = output.split('\n', Utils::SkipEmptyParts);
     for (const QString &l : lines) {
         QString currentBranch = l.mid(2); // remove first letters (those are either
                                           // "  " or "* " depending on whether it is
diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp
index 63d05614bd..bd5cd09b1d 100644
--- a/src/plugins/git/gerrit/gerritpushdialog.cpp
+++ b/src/plugins/git/gerrit/gerritpushdialog.cpp
@@ -31,6 +31,7 @@
 #include "../gitconstants.h"
 
 #include <utils/icon.h>
+#include <utils/stringutils.h>
 #include <utils/theme/theme.h>
 
 #include <QApplication>
@@ -290,7 +291,7 @@ QString GerritPushDialog::pushTarget() const
     if (!topic.isEmpty())
         target += '/' + topic;
 
-    const QStringList reviewersInput = reviewers().split(',', QString::SkipEmptyParts);
+    const QStringList reviewersInput = reviewers().split(',', Utils::SkipEmptyParts);
     for (const QString &reviewer : reviewersInput)
         options << "r=" + reviewer;
 
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 22bed1ab0b..16337bf5b6 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -49,6 +49,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 #include <utils/temporaryfile.h>
 #include <utils/theme/theme.h>
@@ -838,7 +839,7 @@ QStringList GitClient::unmanagedFiles(const QString &workingDirectory,
     if (response.result != SynchronousProcessResponse::Finished)
         return filePaths;
     const QStringList managedFilePaths
-            = transform(response.stdOut().split('\0', QString::SkipEmptyParts),
+            = transform(response.stdOut().split('\0', Utils::SkipEmptyParts),
                         [&wd](const QString &fp) { return wd.absoluteFilePath(fp); });
     return filtered(filePaths, [&managedFilePaths](const QString &fp) {
         return !managedFilePaths.contains(fp);
@@ -3231,7 +3232,7 @@ void GitClient::push(const QString &workingDirectory, const QStringList &pushArg
             command->setCookie(NoRemoteBranch);
 
         if (command->cookie().toInt() == NoRemoteBranch) {
-            const QStringList lines = text.split('\n', QString::SkipEmptyParts);
+            const QStringList lines = text.split('\n', Utils::SkipEmptyParts);
             for (const QString &line : lines) {
                 /* Extract the suggested command from the git output which
                  * should be similar to the following:
@@ -3281,7 +3282,7 @@ void GitClient::push(const QString &workingDirectory, const QStringList &pushArg
                             QMessageBox::No) == QMessageBox::Yes) {
 
                     const QStringList fallbackCommandParts =
-                            m_pushFallbackCommand.split(' ', QString::SkipEmptyParts);
+                            m_pushFallbackCommand.split(' ', Utils::SkipEmptyParts);
                     VcsCommand *rePushCommand = vcsExec(workingDirectory,
                                                         fallbackCommandParts.mid(1),
                             nullptr, true, VcsCommand::ShowSuccessMessage);
diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp
index 100fe940c8..461020f4dd 100644
--- a/src/plugins/help/localhelpmanager.cpp
+++ b/src/plugins/help/localhelpmanager.cpp
@@ -46,16 +46,17 @@
 
 #include <app/app_version.h>
 #include <coreplugin/icore.h>
+
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
 #include <utils/optional.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDesktopServices>
 #include <QFontDatabase>
-#include <QMutexLocker>
-
 #include <QHelpEngine>
+#include <QMutexLocker>
 
 using namespace Help::Internal;
 
@@ -269,7 +270,7 @@ void LocalHelpManager::setScrollWheelZoomingEnabled(bool enabled)
 QStringList LocalHelpManager::lastShownPages()
 {
     const QVariant value = Core::ICore::settings()->value(kLastShownPagesKey, QVariant());
-    return value.toString().split(Constants::ListSeparator, QString::SkipEmptyParts);
+    return value.toString().split(Constants::ListSeparator, Utils::SkipEmptyParts);
 }
 
 void LocalHelpManager::setLastShownPages(const QStringList &pages)
@@ -281,7 +282,7 @@ QList<float> LocalHelpManager::lastShownPagesZoom()
 {
     const QVariant value = Core::ICore::settings()->value(kLastShownPagesZoomKey, QVariant());
     const QStringList stringValues = value.toString().split(Constants::ListSeparator,
-                                                            QString::SkipEmptyParts);
+                                                            Utils::SkipEmptyParts);
     return Utils::transform(stringValues, [](const QString &str) { return str.toFloat(); });
 }
 
diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp
index e15873238b..7f997595cf 100644
--- a/src/plugins/help/openpagesmanager.cpp
+++ b/src/plugins/help/openpagesmanager.cpp
@@ -32,6 +32,13 @@
 #include "openpagesswitcher.h"
 #include "openpageswidget.h"
 
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/modemanager.h>
+
+#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
+#include <utils/styledbar.h>
+
 #include <QApplication>
 #include <QClipboard>
 #include <QComboBox>
@@ -39,10 +46,6 @@
 
 #include <QHelpEngine>
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/modemanager.h>
-#include <utils/qtcassert.h>
-
 using namespace Core;
 using namespace Help::Internal;
 
@@ -110,7 +113,7 @@ QComboBox *OpenPagesManager::openPagesComboBox() const
 QStringList splitString(const QVariant &value)
 {
     using namespace Help::Constants;
-    return value.toString().split(ListSeparator, QString::SkipEmptyParts);
+    return value.toString().split(ListSeparator, Utils::SkipEmptyParts);
 }
 
 void OpenPagesManager::setupInitialPages()
diff --git a/src/plugins/help/qlitehtml/container_qpainter.cpp b/src/plugins/help/qlitehtml/container_qpainter.cpp
index bf98f3f08f..96dffd7330 100644
--- a/src/plugins/help/qlitehtml/container_qpainter.cpp
+++ b/src/plugins/help/qlitehtml/container_qpainter.cpp
@@ -25,6 +25,8 @@
 
 #include "container_qpainter.h"
 
+#include <utils/stringutils.h>
+
 #include <QClipboard>
 #include <QCursor>
 #include <QDebug>
@@ -446,7 +448,7 @@ litehtml::uint_ptr DocumentContainer::create_font(const litehtml::tchar_t *faceN
                                                   unsigned int decoration,
                                                   litehtml::font_metrics *fm)
 {
-    const QStringList splitNames = QString::fromUtf8(faceName).split(',', QString::SkipEmptyParts);
+    const QStringList splitNames = QString::fromUtf8(faceName).split(',', Utils::SkipEmptyParts);
     QStringList familyNames;
     std::transform(splitNames.cbegin(),
                    splitNames.cend(),
diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index f6b1b35079..ea76d980da 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -32,7 +32,9 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+
 #include <utils/progressindicator.h>
+#include <utils/stringutils.h>
 #include <utils/styledbar.h>
 #include <utils/utilsicons.h>
 
@@ -261,7 +263,7 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
 
 QStringList SearchWidget::currentSearchTerms() const
 {
-    return searchEngine->searchInput().split(QRegExp("\\W+"), QString::SkipEmptyParts);
+    return searchEngine->searchInput().split(QRegExp("\\W+"), Utils::SkipEmptyParts);
 }
 
 // #pragma mark -- SearchSideBarItem
diff --git a/src/plugins/imageviewer/multiexportdialog.cpp b/src/plugins/imageviewer/multiexportdialog.cpp
index 8e09033e27..a09e2e2db2 100644
--- a/src/plugins/imageviewer/multiexportdialog.cpp
+++ b/src/plugins/imageviewer/multiexportdialog.cpp
@@ -31,32 +31,31 @@
 #include <coreplugin/icore.h>
 
 #include <utils/pathchooser.h>
+#include <utils/stringutils.h>
 #include <utils/utilsicons.h>
 
 #include <QApplication>
+#include <QDebug>
 #include <QDesktopWidget>
 #include <QDialogButtonBox>
+#include <QDir>
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QFormLayout>
 #include <QHBoxLayout>
-#include <QMessageBox>
-#include <QMenu>
+#include <QImageWriter>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMenu>
+#include <QMessageBox>
 #include <QPushButton>
+#include <QSettings>
 #include <QSpinBox>
+#include <QTextStream>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QWidgetAction>
 
-#include <QImageWriter>
-
-#include <QDebug>
-#include <QDir>
-#include <QFileInfo>
-#include <QSettings>
-#include <QTextStream>
-
 namespace ImageViewer {
 namespace Internal {
 
@@ -114,7 +113,7 @@ static QVector<QSize> stringToSizes(const QString &s)
 {
     QVector<QSize> result;
     const QString trimmed = s.trimmed();
-    const QVector<QStringRef> &sizes = trimmed.splitRef(',', QString::SkipEmptyParts);
+    const QVector<QStringRef> &sizes = trimmed.splitRef(',', Utils::SkipEmptyParts);
     result.reserve(sizes.size());
     for (const QStringRef &sizeSpec : sizes) {
         const QSize size = sizeFromString(sizeSpec);
diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp
index decbfdca76..87530aaf3d 100644
--- a/src/plugins/languageclient/languageclientsettings.cpp
+++ b/src/plugins/languageclient/languageclientsettings.cpp
@@ -34,14 +34,17 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <coreplugin/variablechooser.h>
+
 #include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
+
 #include <utils/algorithm.h>
 #include <utils/utilsicons.h>
 #include <utils/delegates.h>
 #include <utils/fancylineedit.h>
 #include <utils/mimetypes/mimedatabase.h>
 #include <utils/jsontreeitem.h>
+#include <utils/stringutils.h>
 
 #include <QBoxLayout>
 #include <QComboBox>
@@ -810,8 +813,8 @@ QString BaseSettingsWidget::name() const
 
 LanguageFilter BaseSettingsWidget::filter() const
 {
-    return {m_mimeTypes->text().split(filterSeparator, QString::SkipEmptyParts),
-                m_filePattern->text().split(filterSeparator, QString::SkipEmptyParts)};
+    return {m_mimeTypes->text().split(filterSeparator, Utils::SkipEmptyParts),
+                m_filePattern->text().split(filterSeparator, Utils::SkipEmptyParts)};
 }
 
 BaseSettings::StartBehavior BaseSettingsWidget::startupBehavior() const
@@ -910,7 +913,7 @@ private:
 
 void BaseSettingsWidget::showAddMimeTypeDialog()
 {
-    MimeTypeDialog dialog(m_mimeTypes->text().split(filterSeparator, QString::SkipEmptyParts),
+    MimeTypeDialog dialog(m_mimeTypes->text().split(filterSeparator, Utils::SkipEmptyParts),
                           Core::ICore::dialogParent());
     if (dialog.exec() == QDialog::Rejected)
         return;
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index 2bada42658..9b19eafc8e 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -40,6 +40,7 @@
 #include <utils/environment.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QComboBox>
 #include <QFormLayout>
@@ -428,7 +429,7 @@ public:
 
     QStringList entries() const
     {
-        return textEditWidget()->toPlainText().split(QLatin1Char('\n'), QString::SkipEmptyParts);
+        return textEditWidget()->toPlainText().split(QLatin1Char('\n'), Utils::SkipEmptyParts);
     }
 
     QString text() const
@@ -547,7 +548,7 @@ void CustomToolChainConfigWidget::applyImpl()
     tc->setMakeCommand(m_makeCommand->filePath());
     tc->setTargetAbi(m_abiWidget->currentAbi());
     Macros macros = Utils::transform<QVector>(
-                m_predefinedDetails->text().split('\n', QString::SkipEmptyParts),
+                m_predefinedDetails->text().split('\n', Utils::SkipEmptyParts),
                 [](const QString &m) {
         return Macro::fromKeyValue(m);
     });
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index 6c5c6cdb3a..323c0d6100 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -29,12 +29,13 @@
 #include <coreplugin/icore.h>
 #include <cpptools/cpptoolsconstants.h>
 
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/macroexpander.h>
+#include <utils/mimetypes/mimedatabase.h>
+#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/templateengine.h>
 #include <utils/temporarydirectory.h>
 #include <utils/temporaryfile.h>
-#include <utils/qtcassert.h>
 
 #include <QCoreApplication>
 #include <QDate>
@@ -450,7 +451,7 @@ static inline IWizardFactory::WizardKind kindAttribute(const QXmlStreamReader &r
 static inline QSet<Id> readRequiredFeatures(const QXmlStreamReader &reader)
 {
     QString value = reader.attributes().value(QLatin1String(featuresRequiredC)).toString();
-    QStringList stringList = value.split(QLatin1Char(','), QString::SkipEmptyParts);
+    QStringList stringList = value.split(QLatin1Char(','), Utils::SkipEmptyParts);
     QSet<Id> features;
     foreach (const QString &string, stringList)
         features |= Id::fromString(string);
diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp
index d2417a81b2..70269e49ca 100644
--- a/src/plugins/projectexplorer/environmentwidget.cpp
+++ b/src/plugins/projectexplorer/environmentwidget.cpp
@@ -37,6 +37,7 @@
 #include <utils/itemviews.h>
 #include <utils/namevaluevalidator.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/tooltip/tooltip.h>
 
 #include <QDialogButtonBox>
@@ -82,7 +83,7 @@ public:
         m_view.setHeaderLabel(varName);
         m_view.setDragDropMode(QAbstractItemView::InternalMove);
         const QStringList pathList = paths.split(Utils::HostOsInfo::pathListSeparator(),
-                                                 QString::SkipEmptyParts);
+                                                 Utils::SkipEmptyParts);
         for (const QString &path : pathList)
             addPath(path);
 
@@ -442,7 +443,7 @@ bool EnvironmentWidget::currentEntryIsPathList(const QModelIndex &current) const
     if (valueIndex.column() == 0)
         valueIndex = valueIndex.siblingAtColumn(1);
     const QStringList entries = d->m_model->data(valueIndex).toString()
-            .split(Utils::HostOsInfo::pathListSeparator(), QString::SkipEmptyParts);
+            .split(Utils::HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts);
     if (entries.length() < 2)
         return false;
     for (const QString &potentialDir : entries) {
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
index ab99fa4de9..fdb68958b8 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
@@ -39,6 +39,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QDir>
 #include <QMessageBox>
@@ -209,7 +210,7 @@ void JsonSummaryPage::addToProject(const JsonWizard::GeneratorFiles &files)
             return;
         }
         const QStringList dependencies = m_wizard->stringValue("Dependencies")
-                .split(':', QString::SkipEmptyParts);
+                .split(':', Utils::SkipEmptyParts);
         if (!dependencies.isEmpty())
             folder->addDependencies(dependencies);
     }
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
index a9fb2b54a8..0d46128e12 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
@@ -324,7 +324,7 @@ static QStringList environmentTemplatesPaths()
 
     if (!envTempPath.isEmpty()) {
         for (const QString &path : envTempPath
-             .split(Utils::HostOsInfo::pathListSeparator(), QString::SkipEmptyParts)) {
+             .split(Utils::HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts)) {
             QString canonicalPath = QDir(path).canonicalPath();
             if (!canonicalPath.isEmpty() && !paths.contains(canonicalPath))
                 paths.append(canonicalPath);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index e0c9f82b41..c873fa8014 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2014,7 +2014,7 @@ void ProjectExplorerPlugin::extensionsInitialized()
             const QString gitBinary = Core::ICore::settings()->value("Git/BinaryPath", "git")
                     .toString();
             const QStringList rawGitSearchPaths = Core::ICore::settings()->value("Git/Path")
-                    .toString().split(':', QString::SkipEmptyParts);
+                    .toString().split(':', Utils::SkipEmptyParts);
             const Utils::FilePaths gitSearchPaths = Utils::transform(rawGitSearchPaths,
                     [](const QString &rawPath) { return Utils::FilePath::fromString(rawPath); });
             const Utils::FilePath fullGitPath = Utils::Environment::systemEnvironment()
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index d9dba7d710..173f4bb8fa 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -79,7 +79,7 @@ static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder,
             directoryWithoutPrefix = directory;
         }
     }
-    QStringList parts = directoryWithoutPrefix.toString().split('/', QString::SkipEmptyParts);
+    QStringList parts = directoryWithoutPrefix.toString().split('/', Utils::SkipEmptyParts);
     if (!Utils::HostOsInfo::isWindowsHost() && !isRelative && !parts.isEmpty())
         parts[0].prepend('/');
 
diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp
index 7917bbe08c..551a4b8fb4 100644
--- a/src/plugins/projectexplorer/selectablefilesmodel.cpp
+++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp
@@ -33,6 +33,7 @@
 #include <utils/fancylineedit.h>
 #include <utils/pathchooser.h>
 #include <utils/runextensions.h>
+#include <utils/stringutils.h>
 
 #include <QDialogButtonBox>
 #include <QDir>
@@ -349,7 +350,7 @@ void SelectableFilesModel::collectFiles(Tree *root, Utils::FilePaths *result) co
 QList<Glob> SelectableFilesModel::parseFilter(const QString &filter)
 {
     QList<Glob> result;
-    const QStringList list = filter.split(QLatin1Char(';'), QString::SkipEmptyParts);
+    const QStringList list = filter.split(QLatin1Char(';'), Utils::SkipEmptyParts);
     for (const QString &e : list) {
         QString entry = e.trimmed();
         Glob g;
diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp b/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
index 0b758e01bc..20abff738b 100644
--- a/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
+++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
@@ -29,14 +29,14 @@
 
 #include <utils/hostosinfo.h>
 #include <utils/fileutils.h>
+#include <utils/stringutils.h>
 
+#include <QFileInfo>
 #include <QLabel>
 #include <QRadioButton>
 #include <QScrollArea>
-#include <QVBoxLayout>
-
-#include <QFileInfo>
 #include <QTextStream>
+#include <QVBoxLayout>
 
 using namespace QmakeProjectManager;
 using namespace QmakeProjectManager::Internal;
@@ -52,7 +52,7 @@ QStringList qt_clean_filter_list(const QString &filter)
     int i = regexp.indexIn(f);
     if (i >= 0)
         f = regexp.cap(2);
-    return f.split(QLatin1Char(' '), QString::SkipEmptyParts);
+    return f.split(QLatin1Char(' '), Utils::SkipEmptyParts);
 }
 
 static bool validateLibraryPath(const Utils::FilePath &filePath,
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 28a130a78f..f6731839c4 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -54,6 +54,7 @@
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 #include <utils/winutils.h>
 
@@ -2132,7 +2133,7 @@ static QStringList extractFieldsFromBuildString(const QByteArray &buildString)
     result.append(match.captured(1)); // qtVersion
 
     // Abi info string:
-    QStringList abiInfo = match.captured(2).split('-', QString::SkipEmptyParts);
+    QStringList abiInfo = match.captured(2).split('-', Utils::SkipEmptyParts);
 
     result.append(abiInfo.takeFirst()); // cpu
 
diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index 96bfa90629..3c63791a84 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -44,6 +44,7 @@
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/stylehelper.h>
 
 #include <algorithm>
@@ -336,9 +337,9 @@ void ExamplesListModel::parseExamples(QXmlStreamReader *reader,
             } else if (reader->name() == QLatin1String("dependency")) {
                 item->dependencies.append(projectsOffset + slash + reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
             } else if (reader->name() == QLatin1String("tags")) {
-                item->tags = trimStringList(reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement).split(QLatin1Char(','), QString::SkipEmptyParts));
+                item->tags = trimStringList(reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement).split(QLatin1Char(','), Utils::SkipEmptyParts));
             } else if (reader->name() == QLatin1String("platforms")) {
-                item->platforms = trimStringList(reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement).split(QLatin1Char(','), QString::SkipEmptyParts));
+                item->platforms = trimStringList(reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement).split(QLatin1Char(','), Utils::SkipEmptyParts));
         }
             break;
         case QXmlStreamReader::EndElement:
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 6aab9e47ad..c4e6cf41e0 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -48,6 +48,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/port.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 using namespace ProjectExplorer;
 using namespace Utils;
@@ -88,7 +89,7 @@ private:
     {
         QList<DeviceProcessItem> processes;
         const QStringList lines = listProcessesReply.split(QString::fromLatin1(Delimiter0)
-                + QString::fromLatin1(Delimiter1), QString::SkipEmptyParts);
+                + QString::fromLatin1(Delimiter1), Utils::SkipEmptyParts);
         foreach (const QString &line, lines) {
             const QStringList elements = line.split(QLatin1Char('\n'));
             if (elements.count() < 4) {
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index 45edb51a1a..9644f7df7d 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -29,6 +29,8 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/runcontrol.h>
 
+#include <utils/stringutils.h>
+
 using namespace ProjectExplorer;
 using namespace Utils;
 
@@ -106,7 +108,7 @@ void RemoteLinuxEnvironmentReader::remoteProcessFinished()
         QString remoteOutput = QString::fromUtf8(m_deviceProcess->readAllStandardOutput());
         if (!remoteOutput.isEmpty()) {
             m_env = Utils::Environment(remoteOutput.split(QLatin1Char('\n'),
-                QString::SkipEmptyParts), Utils::OsTypeLinux);
+                Utils::SkipEmptyParts), Utils::OsTypeLinux);
         }
     }
     setFinished();
diff --git a/src/plugins/scxmleditor/common/colorthemes.cpp b/src/plugins/scxmleditor/common/colorthemes.cpp
index 06b503a569..8f553bd9bd 100644
--- a/src/plugins/scxmleditor/common/colorthemes.cpp
+++ b/src/plugins/scxmleditor/common/colorthemes.cpp
@@ -30,9 +30,10 @@
 #include "scxmleditorconstants.h"
 #include "scxmltag.h"
 
-#include <QMenu>
-
 #include <coreplugin/icore.h>
+#include <utils/stringutils.h>
+
+#include <QMenu>
 
 using namespace ScxmlEditor::Common;
 
@@ -152,9 +153,9 @@ void ColorThemes::setDocument(ScxmlEditor::PluginInterface::ScxmlDocument *doc)
     if (m_document) {
         PluginInterface::ScxmlTag *scxmlTag = m_document->scxmlRootTag();
         if (scxmlTag && scxmlTag->hasEditorInfo(Constants::C_SCXML_EDITORINFO_COLORS)) {
-            const QStringList colors = scxmlTag->editorInfo(Constants::C_SCXML_EDITORINFO_COLORS).split(";;", QString::SkipEmptyParts);
+            const QStringList colors = scxmlTag->editorInfo(Constants::C_SCXML_EDITORINFO_COLORS).split(";;", Utils::SkipEmptyParts);
             for (const QString &color : colors) {
-                const QStringList colorInfo = color.split("_", QString::SkipEmptyParts);
+                const QStringList colorInfo = color.split("_", Utils::SkipEmptyParts);
                 if (colorInfo.count() == 2)
                     documentColors[colorInfo[0]] = colorInfo[1];
             }
diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
index 863b40ae0c..16182f5895 100644
--- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
@@ -41,6 +41,7 @@
 #include "warningitem.h"
 
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QAction>
 #include <QGuiApplication>
@@ -286,7 +287,7 @@ void GraphicsScene::paste(const QPointF &targetPos)
     QString strMinPos = QLatin1String(mimeData->data("StateChartEditor/CopiedMinPos"));
     QPointF minPos(0, 0);
     if (!strMinPos.isEmpty()) {
-        QStringList coords = strMinPos.split(":", QString::SkipEmptyParts);
+        QStringList coords = strMinPos.split(":", Utils::SkipEmptyParts);
         if (coords.count() == 2)
             minPos = QPointF(coords[0].toDouble(), coords[1].toDouble());
     }
diff --git a/src/plugins/scxmleditor/plugin_interface/serializer.cpp b/src/plugins/scxmleditor/plugin_interface/serializer.cpp
index 93cd3f1571..1959d0713d 100644
--- a/src/plugins/scxmleditor/plugin_interface/serializer.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/serializer.cpp
@@ -25,6 +25,8 @@
 
 #include "serializer.h"
 
+#include <utils/stringutils.h>
+
 using namespace ScxmlEditor::PluginInterface;
 
 Serializer::Serializer()
@@ -106,7 +108,7 @@ void Serializer::read(QPoint &d)
 
 void Serializer::setData(const QString &d)
 {
-    m_data = d.split(m_separator, QString::SkipEmptyParts);
+    m_data = d.split(m_separator, Utils::SkipEmptyParts);
     m_index = 0;
 }
 
diff --git a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
index acecc460b8..1601973f2a 100644
--- a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
@@ -40,6 +40,8 @@
 #include "transitionitem.h"
 #include "utilsprovider.h"
 
+#include <utils/stringutils.h>
+
 #include <QBrush>
 #include <QCoreApplication>
 #include <QDebug>
@@ -119,7 +121,7 @@ void StateItem::updateAttributes()
         // Check initial attribute
         QString strNewId = tagValue("id", true);
         if (!m_parallelState) {
-            QStringList NSIDs = strNewId.split(tag()->document()->nameSpaceDelimiter(), QString::SkipEmptyParts);
+            QStringList NSIDs = strNewId.split(tag()->document()->nameSpaceDelimiter(), Utils::SkipEmptyParts);
             if (!NSIDs.isEmpty()) {
                 NSIDs[NSIDs.count() - 1] = m_stateNameItem->toPlainText();
                 QString strOldId = NSIDs.join(tag()->document()->nameSpaceDelimiter());
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index f8a65cb9fe..9ac01e6734 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -59,6 +59,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 
 #include <QDebug>
@@ -151,7 +152,7 @@ StatusList parseStatusOutput(const QString &output)
 {
     StatusList changeSet;
     const QString newLine = QString(QLatin1Char('\n'));
-    const QStringList list = output.split(newLine, QString::SkipEmptyParts);
+    const QStringList list = output.split(newLine, Utils::SkipEmptyParts);
     foreach (const QString &l, list) {
         const QString line =l.trimmed();
         if (line.size() > 8) {
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 85073877ac..34f7b6de75 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -28,21 +28,23 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/find/findplugin.h>
 #include <coreplugin/icore.h>
+
 #include <utils/filesearch.h>
 #include <utils/fileutils.h>
 #include <utils/historycompleter.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
+#include <QComboBox>
 #include <QDebug>
-#include <QSettings>
 #include <QDir>
-#include <QPushButton>
 #include <QFileDialog>
-#include <QLabel>
 #include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QSettings>
 #include <QStackedWidget>
-#include <QComboBox>
 
 using namespace Core;
 using namespace TextEditor;
@@ -96,7 +98,7 @@ QString FindInFiles::label() const
 
     const QChar slash = QLatin1Char('/');
     const QStringList &nonEmptyComponents = path().toFileInfo().absoluteFilePath()
-            .split(slash, QString::SkipEmptyParts);
+            .split(slash, Utils::SkipEmptyParts);
     return tr("%1 \"%2\":")
             .arg(title)
             .arg(nonEmptyComponents.isEmpty() ? QString(slash) : nonEmptyComponents.last());
diff --git a/src/plugins/texteditor/highlightersettings.cpp b/src/plugins/texteditor/highlightersettings.cpp
index a048a69575..30174272cf 100644
--- a/src/plugins/texteditor/highlightersettings.cpp
+++ b/src/plugins/texteditor/highlightersettings.cpp
@@ -31,6 +31,7 @@
 
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 
 #include <QSettings>
@@ -141,7 +142,7 @@ void HighlighterSettings::fromSettings(const QString &category, QSettings *s)
 
 void HighlighterSettings::setIgnoredFilesPatterns(const QString &patterns)
 {
-    setExpressionsFromList(patterns.split(QLatin1Char(','), QString::SkipEmptyParts));
+    setExpressionsFromList(patterns.split(QLatin1Char(','), Utils::SkipEmptyParts));
 }
 
 QString HighlighterSettings::ignoredFilesPatterns() const
diff --git a/src/plugins/todo/qmljstodoitemsscanner.cpp b/src/plugins/todo/qmljstodoitemsscanner.cpp
index c3ec33e9cc..68c232695e 100644
--- a/src/plugins/todo/qmljstodoitemsscanner.cpp
+++ b/src/plugins/todo/qmljstodoitemsscanner.cpp
@@ -30,6 +30,8 @@
 
 #include <qmljs/parser/qmljsengine_p.h>
 
+#include <utils/stringutils.h>
+
 namespace Todo {
 namespace Internal {
 
@@ -83,7 +85,7 @@ void QmlJsTodoItemsScanner::processDocument(QmlJS::Document::Ptr doc)
 
         // Process every line
         // TODO: Do not create QStringList, just iterate through a string tracking line endings.
-        QStringList commentLines = source.split('\n', QString::SkipEmptyParts);
+        QStringList commentLines = source.split('\n', Utils::SkipEmptyParts);
         quint32 startLine = sourceLocation.startLine;
         for (int j = 0; j < commentLines.count(); ++j) {
             const QString &commentLine = commentLines.at(j);
diff --git a/src/plugins/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp
index e966452d47..147fba488b 100644
--- a/src/plugins/valgrind/callgrind/callgrindparser.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp
@@ -31,6 +31,7 @@
 #include "callgrindfunction.h"
 
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QFileDevice>
 #include <QHash>
@@ -293,11 +294,11 @@ void Parser::Private::parseHeader(QIODevice *device)
             continue;
         } else if (line.startsWith("positions: ")) {
             QString values = getValue(line, 11);
-            data->setPositions(values.split(' ', QString::SkipEmptyParts));
+            data->setPositions(values.split(' ', Utils::SkipEmptyParts));
             addressValuesCount = data->positions().count();
         } else if (line.startsWith("events: ")) {
             QString values = getValue(line, 8);
-            data->setEvents(values.split(' ', QString::SkipEmptyParts));
+            data->setEvents(values.split(' ', Utils::SkipEmptyParts));
             costValuesCount = data->events().count();
         } else if (line.startsWith("version: ")) {
             QString value = getValue(line, 9);
@@ -320,7 +321,7 @@ void Parser::Private::parseHeader(QIODevice *device)
         } else if (line.startsWith("summary: ")) {
             QString values = getValue(line, 9);
             uint i = 0;
-            foreach (const QStringRef &value, values.splitRef(' ', QString::SkipEmptyParts))
+            foreach (const QStringRef &value, values.splitRef(' ', Utils::SkipEmptyParts))
                 data->setTotalCost(i++, value.toULongLong());
         } else if (!line.trimmed().isEmpty()) {
             // handle line and exit parseHeader
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp
index 51acbfa491..6a647ab8dc 100644
--- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp
+++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp
@@ -30,6 +30,7 @@
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QSettings>
 #include <QVariant>
@@ -368,7 +369,7 @@ int VcsBaseClientSettings::vcsTimeoutS() const
 
 QStringList VcsBaseClientSettings::searchPathList() const
 {
-    return stringValue(pathKey).split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts);
+    return stringValue(pathKey).split(HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts);
 }
 
 QString VcsBaseClientSettings::settingsGroup() const