From 6ff0e9a65657e8c51a37e63efe8169bb7e3050cc Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 20 Jul 2017 19:02:50 +0200 Subject: 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 Reviewed-by: Marco Benelli --- tools/qmlimportscanner/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/qmlimportscanner') 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; -- cgit v1.2.3