summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-08-14 13:23:24 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-08-14 13:23:24 (GMT)
commit1ef8ddc53d3d2512bbe5afbd2e6fb26cae206944 (patch)
treec3973a3c700c229d25e15526cc3bbf677862d8bb /src
parent44265f30fb40baaecd4cda1b5aca0efeed6abc20 (diff)
downloadQt-1ef8ddc53d3d2512bbe5afbd2e6fb26cae206944.zip
Qt-1ef8ddc53d3d2512bbe5afbd2e6fb26cae206944.tar.gz
Qt-1ef8ddc53d3d2512bbe5afbd2e6fb26cae206944.tar.bz2
Pushing compile fix from Gareth, modified by me.
Seems this code path was broken.
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/phonon/phonon/factory.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/phonon/factory.cpp b/src/3rdparty/phonon/phonon/factory.cpp
index e0b245e..b14c2b9 100644
--- a/src/3rdparty/phonon/phonon/factory.cpp
+++ b/src/3rdparty/phonon/phonon/factory.cpp
@@ -133,6 +133,8 @@ bool FactoryPrivate::createBackend()
continue;
}
+ QStringList plugins(dir.entryList(QDir::Files));
+
#ifdef Q_OS_SYMBIAN
/* On Symbian OS we might have two plugins, one which uses Symbian
* MMF framework("phonon_mmf"), and one which uses Real Networks's
@@ -140,6 +142,7 @@ bool FactoryPrivate::createBackend()
* sophisticated, so we make sure the Helix backend is attempted
* to be loaded first, and the MMF backend is used for backup. */
{
+
const int hxphonon = plugins.indexOf(QLatin1String("hxphonon"));
if (hxphonon != -1)
plugins.move(hxphonon, 0);
@@ -152,9 +155,8 @@ bool FactoryPrivate::createBackend()
}
#endif
- const QStringList files = dir.entryList(QDir::Files);
- for (int i = 0; i < files.count(); ++i) {
- QPluginLoader pluginLoader(libPath + files.at(i));
+ for (int i = 0; i < plugins.count(); ++i) {
+ QPluginLoader pluginLoader(libPath + plugins.at(i));
if (!pluginLoader.load()) {
pDebug() << Q_FUNC_INFO << " load failed:"
<< pluginLoader.errorString();