summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-07-03 14:38:27 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-07-03 14:44:26 (GMT)
commit7ead0ff857d8f164e9cfa3f756a1b234a76eedc6 (patch)
tree8de8d10dd7c0c33584151eae6b6cf984578c5ba4
parent0e54042f2d339ecf85a89f8603317c32da265a90 (diff)
downloadQt-7ead0ff857d8f164e9cfa3f756a1b234a76eedc6.zip
Qt-7ead0ff857d8f164e9cfa3f756a1b234a76eedc6.tar.gz
Qt-7ead0ff857d8f164e9cfa3f756a1b234a76eedc6.tar.bz2
Adjust comment field.
-rw-r--r--src/3rdparty/phonon/mmf/backend.cpp2
-rw-r--r--src/3rdparty/phonon/phonon/factory.cpp8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/backend.cpp b/src/3rdparty/phonon/mmf/backend.cpp
index 9419fb8..86d329b 100644
--- a/src/3rdparty/phonon/mmf/backend.cpp
+++ b/src/3rdparty/phonon/mmf/backend.cpp
@@ -32,7 +32,7 @@ Backend::Backend(QObject *parent)
setProperty("identifier", QLatin1String("mmf"));
setProperty("backendName", QLatin1String("MMF"));
- setProperty("backendComment", QLatin1String("MMF Backend"));
+ setProperty("backendComment", QLatin1String("Backend using Nokia's S60 Multimedia Framework Architecture (MMF)."));
setProperty("backendVersion", QLatin1String("0.1"));
setProperty("backendWebsite", QLatin1String("http://www.qtsoftware.com/"));
}
diff --git a/src/3rdparty/phonon/phonon/factory.cpp b/src/3rdparty/phonon/phonon/factory.cpp
index 1026bb3..34d04fa 100644
--- a/src/3rdparty/phonon/phonon/factory.cpp
+++ b/src/3rdparty/phonon/phonon/factory.cpp
@@ -141,9 +141,15 @@ 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 helix = plugins.indexof(QLatin1String("hxphonon"));
+ const int helix = plugins.indexOf(QLatin1String("hxphonon"));
if (helix != -1)
plugins.move(helix, 0);
+
+ // Code for debugging the MMF backend.
+ if(helix != -1) {
+ qDebug() << "Found helix, and removed it from the lookup list.";
+ plugins.removeAll(QLatin1String("hxphonon"));
+ }
}
#endif