Skip to content

Commit

Permalink
Close #300, thanks kviktor
Browse files Browse the repository at this point in the history
In probonopd/linuxdeployqt#300 (comment) @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)
  • Loading branch information
probonopd authored Jun 18, 2018
1 parent 2e5d66b commit 307d1d5
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions shared.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
// where deploying QtQuick.Controls will also deploy the "Styles" sub-import.
if (QDir().exists(importDestinationPath))
return;
// 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;
}

recursiveCopyAndDeploy(appDirPath, rpaths, importSourcePath, importDestinationPath);
}
Expand Down

0 comments on commit 307d1d5

Please sign in to comment.