Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Aug 2014 11:10:56 +0000 (13:10 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Aug 2014 11:10:56 +0000 (13:10 +0200)
Conflicts:
src/macdeployqt/shared/shared.cpp

Change-Id: I121d34332ec6ad04ee579838bc40be0ea1b9e290

1  2 
src/macdeployqt/shared/shared.cpp

@@@ -567,6 -567,21 +567,15 @@@ void deployPlugins(const ApplicationBun
      // Cocoa print support
      pluginList.append("printsupport/libcocoaprintersupport.dylib");
  
 -    // Accessibility
 -    if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("QtWidgets.framework")))
 -        pluginList.append("accessible/libqtaccessiblewidgets.dylib");
 -    if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("QtQuick.framework")))
 -        pluginList.append("accessible/libqtaccessiblequick.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) {