diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:10:56 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:10:56 +0200 |
| commit | 082f74efa1f1f89467380ad5229bd84325ee3767 (patch) | |
| tree | 3f0ed2ec0779cc523fea8c24fd73b47ebe395199 | |
| parent | 28f0d610e3e4c5f1e244bcc73a13b6dda84b8574 (diff) | |
| parent | 33b79808bdce641a06b4cc8e4f1aa6e332742bf3 (diff) | |
| download | qttools-082f74efa1f1f89467380ad5229bd84325ee3767.tar.gz qttools-082f74efa1f1f89467380ad5229bd84325ee3767.tar.bz2 qttools-082f74efa1f1f89467380ad5229bd84325ee3767.zip | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/macdeployqt/shared/shared.cpp
Change-Id: I121d34332ec6ad04ee579838bc40be0ea1b9e290
| -rw-r--r-- | src/macdeployqt/shared/shared.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 2b063a6d..d2eeea09 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -567,6 +567,15 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl // Cocoa print support pluginList.append("printsupport/libcocoaprintersupport.dylib"); + // Network + if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("QtNetwork.framework"))) { + QStringList bearerPlugins = QDir(pluginSourcePath + QStringLiteral("/bearer")).entryList(QStringList() << QStringLiteral("*.dylib")); + foreach (const QString &plugin, bearerPlugins) { + if (!plugin.endsWith(QStringLiteral("_debug.dylib"))) + pluginList.append(QStringLiteral("bearer/") + plugin); + } + } + // All image formats (svg if QtSvg.framework is used) QStringList imagePlugins = QDir(pluginSourcePath + QStringLiteral("/imageformats")).entryList(QStringList() << QStringLiteral("*.dylib")); foreach (const QString &plugin, imagePlugins) { |