Make macdeployqt deploy audio plugins.
authorMorten Johan Sørvig <morten.sorvig@digia.com>
Tue, 5 Nov 2013 13:49:47 +0000 (14:49 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 5 Nov 2013 14:29:10 +0000 (15:29 +0100)
Deploy plugins/audio if QtMultimedia.framework is
in use.

Change-Id: I164ddddbf2fbd50c37d42809b5ecdda0ea1d03af
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
src/macdeployqt/shared/shared.cpp

index 0097f92..3ebd043 100644 (file)
@@ -573,12 +573,18 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
         }
     }
 
+    // multimedia plugins if QtMultimedia.framework is in use
     if (deploymentInfo.deployedFrameworks.contains(QStringLiteral("QtMultimedia.framework"))) {
-        QStringList sqlPlugins = QDir(pluginSourcePath + QStringLiteral("/mediaservice")).entryList(QStringList() << QStringLiteral("*.dylib"));
-        foreach (const QString &plugin, sqlPlugins) {
+        QStringList plugins = QDir(pluginSourcePath + QStringLiteral("/mediaservice")).entryList(QStringList() << QStringLiteral("*.dylib"));
+        foreach (const QString &plugin, plugins) {
             if (!plugin.endsWith(QStringLiteral("_debug.dylib")))
                 pluginList.append(QStringLiteral("mediaservice/") + plugin);
         }
+        plugins = QDir(pluginSourcePath + QStringLiteral("/audio")).entryList(QStringList() << QStringLiteral("*.dylib"));
+        foreach (const QString &plugin, plugins) {
+            if (!plugin.endsWith(QStringLiteral("_debug.dylib")))
+                pluginList.append(QStringLiteral("audio/") + plugin);
+        }
     }
 
     foreach (const QString &plugin, pluginList) {