Modify qt.conf

2017-05-25 13:28:29 +02:00
parent e5b7c2f433
commit 731c08ad89
1 changed files with 17 additions and 16 deletions
@@ -1155,19 +1155,20 @@ 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
+    // See https://github.com/probonopd/linuxdeployqt/issues/ 75, 98, 99
+	
+    if(fhsLikeMode){
 	    QByteArray contents = "# Generated by linuxdeployqt\n"
 				  "# https://github.com/probonopd/linuxdeployqt/\n"
 				  "[Paths]\n"
+				  "Prefix = ../\n"
 				  "Plugins = plugins\n"
 				  "Imports = qml\n"
 				  "Qml2Imports = qml\n";	    
-
-    // Workaround for: https://github.com/probonopd/linuxdeployqt/issues/75
-    if(fhsLikeMode == true){
+    } else {
 	    QByteArray contents = "# Generated by linuxdeployqt\n"
 				  "# https://github.com/probonopd/linuxdeployqt/\n"
 				  "[Paths]\n"
-                          "Prefix = ../../\n"
 				  "Plugins = plugins\n"
 				  "Imports = qml\n"
 				  "Qml2Imports = qml\n";