diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-09 01:00:06 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-09 09:58:49 +0100 |
| commit | d51d5ff3c187821929cf7b765e037423bcc90466 (patch) | |
| tree | 0eed81eb1709759058ff2b3b4595ea18774a44c4 /tools/qmllint/findunqualified.cpp | |
| parent | eacb1a08ee4dace7c12a6eed153b9ec69cf95966 (diff) | |
| parent | 12ddd8da1b2dcfbbca10a6915547456601a726c0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qml/compiler/qqmlirbuilder_p.h
src/qml/qml/qqmlpropertycachecreator_p.h
src/qmltyperegistrar/qmltypesclassdescription.cpp
src/qmltyperegistrar/qmltypesclassdescription.h
src/qmltyperegistrar/qmltypescreator.cpp
src/quick/items/qquicktext_p.h
src/quick/util/qquickvaluetypes_p.h
Change-Id: Ic209741592e7b85820bf3845722023a190ebc1c5
Diffstat (limited to 'tools/qmllint/findunqualified.cpp')
| -rw-r--r-- | tools/qmllint/findunqualified.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmllint/findunqualified.cpp b/tools/qmllint/findunqualified.cpp index 187471125a..6155ea4637 100644 --- a/tools/qmllint/findunqualified.cpp +++ b/tools/qmllint/findunqualified.cpp @@ -123,7 +123,7 @@ QStringList completeImportPaths(const QString &uri, const QString &basePath, QTy static const QLatin1Char Slash('/'); static const QLatin1Char Backslash('\\'); - const QVector<QStringRef> parts = uri.splitRef(QLatin1Char('.'), QString::SkipEmptyParts); + const QVector<QStringRef> parts = uri.splitRef(QLatin1Char('.'), Qt::SkipEmptyParts); QStringList qmlDirPathsPaths; // fully & partially versioned parts + 1 unversioned for each base path |