diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-11-05 14:49:47 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 15:29:10 +0100 |
commit | f422af85ef01c73b0ea08026448adf99171809d2 (patch) | |
tree | 55748e8c46948cac5a4791bd97fcb16105b8c23c | |
parent | 4be30140ffb095a77a4a83c863c385c4dbc08014 (diff) |
Make macdeployqt deploy audio plugins.
Deploy plugins/audio if QtMultimedia.framework is
in use.
Change-Id: I164ddddbf2fbd50c37d42809b5ecdda0ea1d03af
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 0097f92cb..3ebd04335 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -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) { |