diff options
Diffstat (limited to 'src/qmlcompiler/qqmljsutils.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljsutils.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/qmlcompiler/qqmljsutils.cpp b/src/qmlcompiler/qqmljsutils.cpp index 2fc0564edc..ad8a14944f 100644 --- a/src/qmlcompiler/qqmljsutils.cpp +++ b/src/qmlcompiler/qqmljsutils.cpp @@ -248,30 +248,14 @@ bool canCompareWithQUrl( return lhsType == typeResolver->urlType() && rhsType == typeResolver->urlType(); } -static QVarLengthArray<QString, 2> resourceFoldersFromBuildFolder(const QString &buildFolder) -{ - QVarLengthArray<QString, 2> result; - const QDir dir(buildFolder); - if (dir.exists(u".rcc"_s)) { - result.append(dir.filePath(u".rcc"_s)); - } - if (dir.exists(u".qt/rcc"_s)) { - result.append(dir.filePath(u".qt/rcc"_s)); - } - return result; -} - - QStringList QQmlJSUtils::resourceFilesFromBuildFolders(const QStringList &buildFolders) { QStringList result; for (const QString &path : buildFolders) { - for (const QString &resourceFolder : resourceFoldersFromBuildFolder(path)) { - QDirIterator it(resourceFolder, QStringList{ u"*.qrc"_s }, QDir::Files, - QDirIterator::Subdirectories); - while (it.hasNext()) { - result.append(it.next()); - } + QDirIterator it(path, QStringList{ u"*.qrc"_s }, QDir::Files | QDir::Hidden, + QDirIterator::Subdirectories); + while (it.hasNext()) { + result.append(it.next()); } } return result; |
