summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@edeltech.ch>2014-07-29 23:57:38 +0200
committerSamuel Gaist <samuel.gaist@edeltech.ch>2014-08-04 11:01:26 +0200
commit33b79808bdce641a06b4cc8e4f1aa6e332742bf3 (patch)
tree3345020f660c2bee787c5c83743f26371883e008
parentb11dcfb0f185483224555c69761bb7e2280e7513 (diff)
downloadqttools-33b79808bdce641a06b4cc8e4f1aa6e332742bf3.tar.gz
Add bearer plugin deployment
This patch implement the bearer plugins deployement [ChangeLog][OS X][macdeployqt] Now correctly deploys the network related plugins Change-Id: I37e8a7033bc4d7d41fe34314ddac7b441696c5b7 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/macdeployqt/shared/shared.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index bf93898b6..32bab47c3 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);
+ }
+ }
+
// Accessibility
if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("QtWidgets.framework")))
pluginList.append("accessible/libqtaccessiblewidgets.dylib");