Add bearer plugin deployment
authorSamuel Gaist <samuel.gaist@edeltech.ch>
Tue, 29 Jul 2014 21:57:38 +0000 (23:57 +0200)
committerSamuel Gaist <samuel.gaist@edeltech.ch>
Mon, 4 Aug 2014 09:01:26 +0000 (11:01 +0200)
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

index bf93898..32bab47 100644 (file)
@@ -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");