From fc571daf7bfb06e63e18aae85e1b134fecdfb99b Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 12 Mar 2017 18:38:17 +0100 Subject: [PATCH] Always use qtToBeBundledInfo.value("QT_INSTALL_QML ") --- shared/shared.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/shared/shared.cpp b/shared/shared.cpp index 7d88403..939a90e 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -1074,20 +1074,15 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo, argumentList.append("-rootPath"); argumentList.append(qmlDir); } - QString qmlImportsPath = qtToBeBundledInfo.value("QT_INSTALL_QML"); - LogDebug() << "qmlImportsPath candidate:" << qmlImportsPath; - // Verify that we found a valid qmlImportsPath - if (!QFile(qmlImportsPath + "/QtQml").exists()) { - LogError() << "Valid qmlImportsPath not found at" << qmlImportsPath; - LogError() << "Possibly your Qt library has the wrong information in qt_prfxpath, e.g., because it was moved since it was compiled"; - return false; - } - - LogDebug() << "qmlImportsPath:" << qmlImportsPath; argumentList.append( "-importPath"); argumentList.append(qmlImportsPath); + argumentList.append( "-importPath"); + argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML ")); + + LogDebug() << "qmlImportsPath:" << qmlImportsPath; + // run qmlimportscanner QProcess qmlImportScanner; LogDebug() << qmlImportScannerPath << argumentList;