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

Close #300, thanks kviktor

Browse Source 
In https://github.com/probonopd/linuxdeployqt/issues/300#issuecomment-398049462 @kviktor writes: 

> With this workaround things seem to work great (originally I just removed the whole if/return part but with that the program ran for about 15 mins, with the current one it takes around 5 min to complete which is close to the original one, also it fixes the issue that `xcbglintegrations` is not getting copied over)
This commit is contained in:
probonopd
2018-06-18 19:46:45 +02:00
committed by GitHub
parent 558a94f47c
commit 5542062897
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/shared.cpp
+8 -1
View File
@@ -1504,8 +1504,15 @@ void deployQmlImport(const QString &appDirPath, const QSet<QString> &rpaths, con
// Skip already deployed imports. This can happen in cases like "QtQuick.Controls.Styles", // Skip already deployed imports. This can happen in cases like "QtQuick.Controls.Styles",
// where deploying QtQuick.Controls will also deploy the "Styles" sub-import. // where deploying QtQuick.Controls will also deploy the "Styles" sub-import.
if (QDir().exists(importDestinationPath)) // NOTE: this stops the deployment of certain imports if there is a folder in them, for example
// - if QtQuick.Controls.Styles is already there QtQuick.Controls is skipped
// - if QtQuick.Extras.Private is there QtQuick.Extras is skipped
QDir destDir(importDestinationPath);
if (destDir.exists()) {
destDir.setFilter(QDir::Files | QDir::NoDotAndDotDot);
if(destDir.entryInfoList().length() > 0)
return; return;
}
recursiveCopyAndDeploy(appDirPath, rpaths, importSourcePath, importDestinationPath); recursiveCopyAndDeploy(appDirPath, rpaths, importSourcePath, importDestinationPath);
} }