diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-09-25 08:20:01 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-10-01 10:52:05 +0200 |
commit | 9ee1ebecf13c44bf4eb987992356c04a7ab08ad4 (patch) | |
tree | 8f04668f3cd4414ee80caa45b53082baa409a8fb | |
parent | d9cafeb0f1a097997a82aeb2e5cccac1d24750cc (diff) | |
download | qttools-9ee1ebecf13c44bf4eb987992356c04a7ab08ad4.tar.gz |
Prevent re-deploying already deployed imports.
Check if the target directory exists before copying
the import.
Change-Id: Id729f26b4b887c7a3b209aa88649eca3fc73b0ba
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 3e581a9db..f75f68e7e 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -828,6 +828,12 @@ void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, void deployQmlImport(const QString &appBundlePath, const QString &importSourcePath, const QString &importName) { QString importDestinationPath = appBundlePath + "/Contents/Resources/qml/" + importName; + + // 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; + recursiveCopyAndDeploy(appBundlePath, importSourcePath, importDestinationPath); } |