diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-27 21:43:05 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-27 21:43:05 (GMT) |
| commit | de78d464b3ace8aaf4da1119ebf76d9af6cb677e (patch) | |
| tree | f1abed6851628b5717531ecdaa1f8ed6d0e4b7f3 /src/multimedia | |
| parent | 6857fd7b99ba0c72c2f09cfc7ad38e9df4f0531c (diff) | |
| parent | c78fb096c31df3b7d3cd9018f26518f59f4fde65 (diff) | |
| download | Qt-de78d464b3ace8aaf4da1119ebf76d9af6cb677e.zip Qt-de78d464b3ace8aaf4da1119ebf76d9af6cb677e.tar.gz Qt-de78d464b3ace8aaf4da1119ebf76d9af6cb677e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/mediaservices/base/qmediapluginloader.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/multimedia/mediaservices/base/qmediapluginloader.cpp b/src/multimedia/mediaservices/base/qmediapluginloader.cpp index d6da0ba..8b0ddf4 100644 --- a/src/multimedia/mediaservices/base/qmediapluginloader.cpp +++ b/src/multimedia/mediaservices/base/qmediapluginloader.cpp @@ -108,7 +108,11 @@ void QMediaPluginLoader::load() if (!pluginDir.exists()) continue; - foreach (QString pluginLib, pluginDir.entryList(QDir::Files)) { + foreach (const QString &pluginLib, pluginDir.entryList(QDir::Files)) { +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + if (pluginLib.endsWith(QLatin1String(".debug"))) + continue; +#endif QPluginLoader loader(pluginPathName + pluginLib); QObject *o = loader.instance(); |