Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/assistant/assistant/doc/src/assistant-manual.qdoc

Change-Id: I136caf5f26eff4d1c2574459b8dff9937c2c372d

1 files changed, 7 insertions, 1 deletions

diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index 557726514..b9d71d11e 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -172,8 +172,9 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
     otool.start("otool", QStringList() << "-L" << binaryPath);
     otool.waitForFinished();
 
-    if (otool.exitCode() != 0) {
+    if (otool.exitStatus() != QProcess::NormalExit || otool.exitCode() != 0) {
         LogError() << otool.readAllStandardError();
+        return info;
     }
 
     static const QRegularExpression regexp(QStringLiteral(
@@ -182,6 +183,11 @@ OtoolInfo findDependencyInfo(const QString &binaryPath)
 
     QString output = otool.readAllStandardOutput();
     QStringList outputLines = output.split("\n", QString::SkipEmptyParts);
+    if (outputLines.size() < 2) {
+        LogError() << "Could not parse otool output:" << output;
+        return info;
+    }
+
     outputLines.removeFirst(); // remove line containing the binary path
     if (binaryPath.contains(".framework/") || binaryPath.endsWith(".dylib")) {
         const auto match = regexp.match(outputLines.first());