Modify qt.conf

shared/shared.cpp

@@ -1155,22 +1155,23 @@ void createQtConf(const QString &appDirPath)
 {
     // Set Plugins and imports paths. These are relative to QCoreApplication::applicationDirPath()
     // which is where the main executable resides; see http://doc.qt.io/qt-5/qt-conf.html
-    QByteArray contents = "# Generated by linuxdeployqt\n"
+    // See https://github.com/probonopd/linuxdeployqt/issues/ 75, 98, 99
-                          "# https://github.com/probonopd/linuxdeployqt/\n"
-                          "[Paths]\n"
-                          "Plugins = plugins\n"
-                          "Imports = qml\n"
-                          "Qml2Imports = qml\n";
 	
-    // Workaround for: https://github.com/probonopd/linuxdeployqt/issues/75
+    if(fhsLikeMode){
-    if(fhsLikeMode == true){
+	    QByteArray contents = "# Generated by linuxdeployqt\n"
-    QByteArray contents = "# Generated by linuxdeployqt\n"
+				  "# https://github.com/probonopd/linuxdeployqt/\n"
-                          "# https://github.com/probonopd/linuxdeployqt/\n"
+				  "[Paths]\n"
-                          "[Paths]\n"
+				  "Prefix = ../\n"
-                          "Prefix = ../../\n"
+				  "Plugins = plugins\n"
-                          "Plugins = plugins\n"
+				  "Imports = qml\n"
-                          "Imports = qml\n"
+				  "Qml2Imports = qml\n";	    
-                          "Qml2Imports = qml\n";	    
+    } else {
+	    QByteArray contents = "# Generated by linuxdeployqt\n"
+				  "# https://github.com/probonopd/linuxdeployqt/\n"
+				  "[Paths]\n"
+				  "Plugins = plugins\n"
+				  "Imports = qml\n"
+				  "Qml2Imports = qml\n";	    
     }
 	
     QString filePath = appDirPath + "/"; // Is picked up when placed next to the main executable