aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJeroen Oomkes <jeruntu@gmail.com>2020-11-29 20:33:39 +0100
committerJeroen Oomkes <jeruntu@gmail.com>2020-11-30 18:01:03 +0000
commitf8f39f6ee43c71a47a0e4d764113747990f53731 (patch)
treeac580866337a00ea2b4b29b52f51657915235015 /tools
parent7e2c2ebbbfa3362f97ba09a002bbb6a672f524af (diff)
Find qml imports inside subdirectories of symlinks
Added QDirIterator::FollowSymlinks flag in function findQmlImportsInDirectory. This is to find qml imports in subdirectories of symlinks. Reason is that qwindeployqt does not scan imports inside directories following symlinks and therefore might skip dependencies that are needed for the application. And this is caused by the qmlimportscanner. [ChangeLog][tools][qmlimportscanner] Follow sybmolic links in findQmlImportsInDirectory Change-Id: I9739164e50cf48ec9e67f63a110e99da83facc2c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlimportscanner/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 70dec3ed96..20f4a46d34 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -478,7 +478,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::NoDotDot, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
QStringList blacklist;
while (iterator.hasNext()) {