TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update shared.cpp

Browse Source
This commit is contained in:
probonopd
2017-05-25 13:41:35 +02:00
committed by GitHub
parent c79654e7e8
commit 08d091725c
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+4 -8
View File
@@ -1156,9 +1156,9 @@ void createQtConf(const QString &appDirPath)
// Set Plugins and imports paths. These are relative to QCoreApplication::applicationDirPath() // 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 // 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 // See https://github.com/probonopd/linuxdeployqt/issues/ 75, 98, 99
QByteArray contents;
if(fhsLikeMode){ if(fhsLikeMode){
QByteArray contents = "# Generated by linuxdeployqt\n" 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"
@@ -1166,9 +1166,10 @@ void createQtConf(const QString &appDirPath)
"Imports = qml\n" "Imports = qml\n"
"Qml2Imports = qml\n"; "Qml2Imports = qml\n";
} else { } else {
QByteArray contents = "# Generated by linuxdeployqt\n" contents = "# Generated by linuxdeployqt\n"
"# https://github.com/probonopd/linuxdeployqt/\n" "# https://github.com/probonopd/linuxdeployqt/\n"
"[Paths]\n" "[Paths]\n"
"Prefix = ./\n"
"Plugins = plugins\n" "Plugins = plugins\n"
"Imports = qml\n" "Imports = qml\n"
"Qml2Imports = qml\n"; "Qml2Imports = qml\n";
@@ -1183,17 +1184,12 @@ void createQtConf(const QString &appDirPath)
if (qtconf.exists() && !alwaysOwerwriteEnabled) { if (qtconf.exists() && !alwaysOwerwriteEnabled) {
LogWarning() << fileName << "already exists, will not overwrite."; LogWarning() << fileName << "already exists, will not overwrite.";
LogWarning() << "To make sure the plugins are loaded from the correct location,";
LogWarning() << "please make sure qt.conf contains the following lines:";
LogWarning() << "[Paths]";
LogWarning() << " Plugins = plugins";
return; return;
} }
qtconf.open(QIODevice::WriteOnly); qtconf.open(QIODevice::WriteOnly);
if (qtconf.write(contents) != -1) { if (qtconf.write(contents) != -1) {
LogNormal() << "Created configuration file:" << fileName; LogNormal() << "Created configuration file:" << fileName;
LogNormal() << "This file sets the plugin search path to" << appDirPath + "/plugins";
} }
} }