1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

androiddeployqt: use QFile::exists instead of QDir().exists

Browse Source 
Internally QDir().exists calls QFile::exists(filePath(name))

Change-Id: I2993d924268b10135bd9df4e9f8165b869946efc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit e2f14e5be702f89e3d54153fd7511c02729e014e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2022-06-09 18:19:41 +02:00 committed by Qt Cherry-pick Bot
parent d3bbbf345a
commit 2d4dbcf01b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/androiddeployqt/main.cpp
View File

@ -1952,18 +1952,18 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
// because it will cause qmlimportscanner to fail.
// This also covers the case when only qtbase is installed in a regular Qt build.
const QString mainImportPath = options->qtInstallDirectory + "/qml"_L1;
if (QDir().exists(mainImportPath))
if (QFile::exists(mainImportPath))
importPaths += shellQuote(mainImportPath);
// These are usually provided by CMake in the deployment json file from paths specified
// in CMAKE_FIND_ROOT_PATH. They might not have qml modules.
for (const QString &prefix : options->extraPrefixDirs)
if (QDir().exists(prefix + "/qml"_L1))
if (QFile::exists(prefix + "/qml"_L1))
importPaths += shellQuote(prefix + "/qml"_L1);
// These are provided by both CMake and qmake.
for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths)) {
if (QDir().exists(qmlImportPath)) {
if (QFile::exists(qmlImportPath)) {
importPaths += shellQuote(qmlImportPath);
} else {
fprintf(stderr, "Warning: QML import path %s does not exist.\n",