diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:01:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:31:34 +0200 |
| commit | 2795ac5d5930fa28ea329529c0dd2e515b361531 (patch) | |
| tree | 8dd01197f5b71e1eb8e3612b0119764623325803 /tools/qmlimportscanner | |
| parent | 8f93d3627a9b76bf77896501129990e33a77f32c (diff) | |
| parent | 6ff0e9a65657e8c51a37e63efe8169bb7e3050cc (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgrenderloop.cpp
Change-Id: Idd7106995b5545fcac869e9056a365ef9edb36ca
Diffstat (limited to 'tools/qmlimportscanner')
| -rw-r--r-- | tools/qmlimportscanner/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp index 26a83395c8..9ab058d37b 100644 --- a/tools/qmlimportscanner/main.cpp +++ b/tools/qmlimportscanner/main.cpp @@ -404,7 +404,7 @@ QVariantList findQmlImportsInDirectory(const QString &qmlDir) if (qmlDir.isEmpty()) return ret; - QDirIterator iterator(qmlDir, QDir::AllDirs | QDir::NoDotDot, QDirIterator::Subdirectories); + QDirIterator iterator(qmlDir, QDir::AllDirs | QDir::NoDot | QDir::NoDotDot, QDirIterator::Subdirectories); QStringList blacklist; while (iterator.hasNext()) { @@ -425,7 +425,7 @@ QVariantList findQmlImportsInDirectory(const QString &qmlDir) if (path.contains(QLatin1String("Debug-iphoneos")) || path.contains(QLatin1String("Release-iphoneos")) || path.contains(QLatin1String("Debug-iphonesimulator")) || path.contains(QLatin1String("Release-iphonesimulator")) #ifdef Q_OS_WIN - || path.contains(QLatin1String("/release/")) || path.contains(QLatin1String("/debug/")) + || path.endsWith(QLatin1String("/release")) || path.endsWith(QLatin1String("/debug")) #endif ){ continue; |