feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Drop Utils::SkipEmptyParts again

Browse Source 
We require Qt 5.14 nowadays.

Change-Id: Iff245257d3cb19207007c0445ee13814e66152dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-21 10:19:36 +02:00
parent c41847ce5d
commit 43b658e9e7
67 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -90,7 +90,7 @@ static QStringList environmentImportPaths()
QStringList paths;
const QStringList importPaths = QString::fromLocal8Bit(qgetenv("QML_IMPORT_PATH")).split(
Utils::HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts);
Utils::HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts);
for (const QString &path : importPaths) {
const QString canonicalPath = QDir(path).canonicalPath();

2
src/libs/qmljs/qmljsutils.cpp
View File

@@ -241,7 +241,7 @@ QString QmlJS::modulePath(const QString &name, const QString &version,
return QString();
const QString sanitizedVersion = version == undefinedVersion ? QString() : version;
const QStringList parts = name.split('.', Utils::SkipEmptyParts);
const QStringList parts = name.split('.', Qt::SkipEmptyParts);
auto mkpath = [] (const QStringList &xs) -> QString { return xs.join(QLatin1Char('/')); };
// Regular expression for building candidates by successively removing minor and major