diff options
author | Andy Shaw <andy.shaw@qt.io> | 2017-05-22 14:59:56 +0200 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2017-05-23 06:17:13 +0000 |
commit | b86216cc4c3a97d21a7b7fac0f0cf0a550d06b01 (patch) | |
tree | 5c2a7875ffecdf143923af3c72cb42a5ca2fb6b9 /src | |
parent | 61cffb9280191a54cd2fe9117074edc2ff1f474b (diff) |
Deploy the iconengines with the application
The iconengines should be deployed automatically since they could be
used by the application without needing to explicitly include their
dependency in the application. This brings it in line with what
windeployqt does too.
[ChangeLog][Platform Specific Changes][macOS] iconengines are deployed
with the application when using macdeployqt.
Task-number: QTBUG-59609
Change-Id: I7fd3bf9d55d2979f30a2ad7959a6a31919d49c8c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index edf5f7d5f..23548236a 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1052,6 +1052,13 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl } } + QStringList iconEngines = QDir(pluginSourcePath + QStringLiteral("/iconengines")).entryList(QStringList() << QStringLiteral("*.dylib")); + foreach (const QString &plugin, iconEngines) { + if (!plugin.endsWith(QStringLiteral("_debug.dylib"))) { + pluginList.append(QStringLiteral("iconengines/") + plugin); + } + } + // Sql plugins if QtSql.framework is in use if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("QtSql") + libInfixWithFramework)) { QStringList sqlPlugins = QDir(pluginSourcePath + QStringLiteral("/sqldrivers")).entryList(QStringList() << QStringLiteral("*.dylib")); |