Merge branch 'master' into master

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);
@@ -1085,6 +1086,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 {

tests/tests-environment.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-sudo add-apt-repository --yes ppa:beineri/opt-qt58-trusty
+sudo add-apt-repository --yes ppa:beineri/opt-qt59-trusty
 sudo apt-get update -qq
 
 wget http://ftp.de.debian.org/debian/pool/main/p/patchelf/patchelf_0.8-2_amd64.deb
@@ -15,4 +15,4 @@ chmod +x appimagetool*AppImage
 sudo cp squashfs-root/usr/bin/* /usr/local/bin
 cd -
 
-sudo apt-get -y install qt58base qt58declarative qt58webengine binutils xpra
+sudo apt-get -y install qt59base qt59declarative qt59webengine binutils xpra