Skip to content

Commit fc571da

Browse files
authored
Always use qtToBeBundledInfo.value("QT_INSTALL_QML ")
1 parent 1d265dc commit fc571da

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

shared/shared.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,20 +1074,15 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo,
10741074
argumentList.append("-rootPath");
10751075
argumentList.append(qmlDir);
10761076
}
1077-
QString qmlImportsPath = qtToBeBundledInfo.value("QT_INSTALL_QML");
1078-
LogDebug() << "qmlImportsPath candidate:" << qmlImportsPath;
10791077

1080-
// Verify that we found a valid qmlImportsPath
1081-
if (!QFile(qmlImportsPath + "/QtQml").exists()) {
1082-
LogError() << "Valid qmlImportsPath not found at" << qmlImportsPath;
1083-
LogError() << "Possibly your Qt library has the wrong information in qt_prfxpath, e.g., because it was moved since it was compiled";
1084-
return false;
1085-
}
1086-
1087-
LogDebug() << "qmlImportsPath:" << qmlImportsPath;
10881078
argumentList.append( "-importPath");
10891079
argumentList.append(qmlImportsPath);
10901080

1081+
argumentList.append( "-importPath");
1082+
argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML "));
1083+
1084+
LogDebug() << "qmlImportsPath:" << qmlImportsPath;
1085+
10911086
// run qmlimportscanner
10921087
QProcess qmlImportScanner;
10931088
LogDebug() << qmlImportScannerPath << argumentList;

0 commit comments

Comments
 (0)