summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-10-08 10:57:20 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-10-29 16:00:08 (GMT)
commit7a6296197cdab656053fbf1fc2584707e78cbe54 (patch)
tree3305f030a71dfb1d58ee8696d6fbb51fe75bf9d5 /src/3rdparty
parent94be7bf47fe93ca4fa6ae90f5906f6ef711f558e (diff)
downloadQt-7a6296197cdab656053fbf1fc2584707e78cbe54.zip
Qt-7a6296197cdab656053fbf1fc2584707e78cbe54.tar.gz
Qt-7a6296197cdab656053fbf1fc2584707e78cbe54.tar.bz2
Make QT_NO_PHONON_PLATFORMPLUGIN work
Reviewed-by:tom
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/phonon/phonon/factory.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/phonon/factory.cpp b/src/3rdparty/phonon/phonon/factory.cpp
index 5c3752a..e5adb490 100644
--- a/src/3rdparty/phonon/phonon/factory.cpp
+++ b/src/3rdparty/phonon/phonon/factory.cpp
@@ -189,11 +189,12 @@ bool FactoryPrivate::createBackend()
}
FactoryPrivate::FactoryPrivate()
+ :
#ifndef QT_NO_PHONON_PLATFORMPLUGIN
- : m_platformPlugin(0),
- m_noPlatformPlugin(false)
+ m_platformPlugin(0),
+ m_noPlatformPlugin(false),
#endif //QT_NO_PHONON_PLATFORMPLUGIN
- , m_backendObject(0)
+ m_backendObject(0)
{
// Add the post routine to make sure that all other global statics (especially the ones from Qt)
// are still available. If the FactoryPrivate dtor is called too late many bad things can happen