macdeployqt: halt on missing qmlimportscanner

This is going to produce a broken bundle; stop
and print the error.

Change-Id: Ie58d357b97adc229393d80e9dde5e10c65c9bc99
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp
index 9dc53ae31..9c6e3fe03 100644
--- a/src/macdeployqt/macdeployqt/main.cpp
+++ b/src/macdeployqt/macdeployqt/main.cpp
@@ -87,6 +87,7 @@ int main(int argc, char **argv)
     extern bool runStripEnabled;
     extern bool alwaysOwerwriteEnabled;
     QStringList additionalExecutables;
+    bool qmldirArgumentUsed = false;
     QStringList qmlDirs;
     extern bool runCodesign;
     extern QString codesignIdentiy;
@@ -125,6 +126,7 @@ int main(int argc, char **argv)
                 additionalExecutables << argument.mid(index+1);
         } else if (argument.startsWith(QByteArray("-qmldir"))) {
             LogDebug() << "Argument found:" << argument;
+            qmldirArgumentUsed = true;
             int index = argument.indexOf('=');
             if (index == -1)
                 LogError() << "Missing qml directory path";
@@ -162,7 +164,9 @@ int main(int argc, char **argv)
     }
 
     if (!qmlDirs.isEmpty()) {
-        deployQmlImports(appBundlePath, deploymentInfo, qmlDirs);
+        bool ok = deployQmlImports(appBundlePath, deploymentInfo, qmlDirs);
+        if (!ok && qmldirArgumentUsed)
+            return 1; // exit if the user explicitly asked for qml import deployment
 
         // Update deploymentInfo.deployedFrameworks - the QML imports
         // may have brought in extra frameworks as dependencies.