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

Merge pull request #91 from afiestas/master

Browse Source 
Remove or replace all uses of qmlImportsPath by qtToBeBundledInfo and exclude /usr/local from distro shipped Qt
This commit is contained in:
probonopd
2017-03-17 17:50:58 +01:00
committed by GitHub
parent fc571daf7b 0fea9e03d2
commit 585f487180
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+3 -6
View File
@@ -810,7 +810,7 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
setenv("LD_LIBRARY_PATH",newPath.toUtf8().constData(),1); setenv("LD_LIBRARY_PATH",newPath.toUtf8().constData(),1);
} }
if(qtLibsPath.startsWith("/usr/")){ if(qtLibsPath.startsWith("/usr/") && !qtLibsPath.startsWith("/usr/local")){
LogError() << "Bundling Qt provided by distributions is not yet supported by this tool."; LogError() << "Bundling Qt provided by distributions is not yet supported by this tool.";
LogError() << "Please see https://github.com/probonopd/linuxdeployqt/issues/79 and"; LogError() << "Please see https://github.com/probonopd/linuxdeployqt/issues/79 and";
LogError() << "submit a Pull Request to implement this."; LogError() << "submit a Pull Request to implement this.";
@@ -1075,13 +1075,10 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo,
argumentList.append(qmlDir); argumentList.append(qmlDir);
} }
argumentList.append( "-importPath");
argumentList.append(qmlImportsPath);
argumentList.append( "-importPath"); argumentList.append( "-importPath");
argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML")); argumentList.append(qtToBeBundledInfo.value("QT_INSTALL_QML"));
LogDebug() << "qmlImportsPath:" << qmlImportsPath; LogDebug() << "qmlImportsPath (QT_INSTALL_QML):" << qtToBeBundledInfo.value("QT_INSTALL_QML");
// run qmlimportscanner // run qmlimportscanner
QProcess qmlImportScanner; QProcess qmlImportScanner;
@@ -1168,7 +1165,7 @@ bool deployQmlImports(const QString &appDirPath, DeploymentInfo deploymentInfo,
if (deploymentInfo.deployedLibraries.contains("QtWidgets") && qtQuickContolsInUse) { if (deploymentInfo.deployedLibraries.contains("QtWidgets") && qtQuickContolsInUse) {
LogNormal() << "Deploying QML import QtQuick/PrivateWidgets"; LogNormal() << "Deploying QML import QtQuick/PrivateWidgets";
QString name = "QtQuick/PrivateWidgets"; QString name = "QtQuick/PrivateWidgets";
QString path = qmlImportsPath + QLatin1Char('/') + name; QString path = qtToBeBundledInfo.value("QT_INSTALL_QML") + QLatin1Char('/') + name;
deployQmlImport(appDirPath, deploymentInfo.rpathsUsed, path, name); deployQmlImport(appDirPath, deploymentInfo.rpathsUsed, path, name);
LogNormal() << ""; LogNormal() << "";
} }