diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2017-07-20 19:02:50 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2017-09-04 19:38:03 +0000 |
| commit | 6ff0e9a65657e8c51a37e63efe8169bb7e3050cc (patch) | |
| tree | 120c1c96efc81b02767bb1096e91a0476bc34677 | |
| parent | ac080cda6d9391663f882a4317be78ad89986ee2 (diff) | |
qmlimportscanner: Only skip debug/release directories if the path ends with them
Since the preceding path may contain debug or release in it, then we
only want to check if the path ends with it as opposed to containing it.
Change-Id: Ib4d466987fccb75771fcd2fa018b6f1375df7dc4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
| -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 bac7694e17..352d385cfe 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; |