diff --git a/shared/shared.cpp b/shared/shared.cpp index 0c35239..a1cbe25 100644 --- a/shared/shared.cpp +++ b/shared/shared.cpp @@ -54,7 +54,8 @@ bool alwaysOwerwriteEnabled = false; QStringList librarySearchPath; bool appstoreCompliant = false; int logLevel = 1; -int qtDetected = 0; +bool qtDetected = 0; +bool qtDetectionComplete = 0; // As long as Qt is not detected yet, ldd may encounter "not found" messages, continue anyway bool deployLibrary = false; using std::cout; @@ -298,7 +299,7 @@ LddInfo findDependencyInfo(const QString &binaryPath) foreach (QString outputLine, outputLines) { // LogDebug() << "ldd outputLine:" << outputLine; - if (outputLine.contains("not found")){ + if ((outputLine.contains("not found")) && (qtDetectionComplete == 1)){ LogError() << "ldd outputLine:" << outputLine.replace("\t", ""); LogError() << "Please ensure that all libraries can be found by ldd. Aborting."; exit(1); @@ -1081,6 +1082,9 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a } } + /* From now on let ldd exit if it doesn't find something */ + qtDetectionComplete = 1; + if(fhsLikeMode == false){ changeIdentification("$ORIGIN/lib/" + bundleLibraryDirectory, QFileInfo(applicationBundle.binaryPath).canonicalFilePath()); } else {