diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-06-16 16:32:50 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-06-16 16:00:22 +0000 |
| commit | 8a697cde64467d66f2c1cd332c0102ea5610fc31 (patch) | |
| tree | 22f42930b33b923ec560cd4ff30105008be3166c | |
| parent | 592e20cf0fba245d94d101f0bf62b1c43d625b5a (diff) | |
| download | qt-creator-8a697cde64467d66f2c1cd332c0102ea5610fc31.tar.gz | |
Fix Qt 5.15 deprecation warnings for QString::SkipEmptyParts
Task-number: QTCREATORBUG-24098
Change-Id: I03ee6811df4346754bbd652f2c3c97477f9cdb7e
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/libs/utils/stringutils.h | 6 | ||||
| -rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h index 430b2a3fd8..f3cce3446f 100644 --- a/src/libs/utils/stringutils.h +++ b/src/libs/utils/stringutils.h @@ -36,6 +36,12 @@ QT_END_NAMESPACE namespace Utils { +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) +constexpr QString::SplitBehavior SkipEmptyParts = QString::SkipEmptyParts; +#else +constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts; +#endif + // Create a usable settings key from a category, // for example Editor|C++ -> Editor_C__ QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category); diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp index db8aa96d58..2bfdfe89c1 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp @@ -31,6 +31,7 @@ #include <utils/algorithm.h> #include <utils/hostosinfo.h> #include <utils/optional.h> +#include <utils/stringutils.h> #include <QDir> #include <QRegularExpression> @@ -236,7 +237,7 @@ QStringList splitCommandLine(QString commandLine, QSet<QString> &flagsCache) } } else { // If 's' is outside quotes ... for (const QString &flag : - part.split(QRegularExpression("\\s+"), QString::SkipEmptyParts)) { + part.split(QRegularExpression("\\s+"), Utils::SkipEmptyParts)) { auto flagIt = flagsCache.insert(flag); result.append(*flagIt); } diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index e559a8400c..448d9c2d72 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -40,6 +40,7 @@ #include <utils/cpplanguage_details.h> #include <utils/fileutils.h> #include <utils/qtcassert.h> +#include <utils/stringutils.h> #include <QDir> #include <QRegularExpression> @@ -742,7 +743,7 @@ void CompilerOptionsBuilder::evaluateCompilerFlags() { static QStringList userBlackList = QString::fromLocal8Bit( qgetenv("QTC_CLANG_CMD_OPTIONS_BLACKLIST")) - .split(';', QString::SkipEmptyParts); + .split(';', Utils::SkipEmptyParts); const Core::Id &toolChain = m_projectPart.toolchainType; bool containsDriverMode = false; |