From 33b79808bdce641a06b4cc8e4f1aa6e332742bf3 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@edeltech.ch>
Date: Tue, 29 Jul 2014 23:57:38 +0200
Subject: [PATCH] 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>
---
src/macdeployqt/shared/shared.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
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");
--
GitLab