Revision dac028c...

Go back to digest for 1st May 2011

Features in Multimedia

Harald Sitter committed changes in [phonon] /:

Make DBus optional even when Qt is built with it

Sometimes it is desirable to build and deploy Phonon without dbus even though
the Qt build has dbus support. To achieve that we have a new cmake option
PHONON_NO_DBUS and a new header providing the setting to the world.
Additionally if QT_NO_DBUS is set, we also set P_N_D, making latter the
ultimate macro to go by.

File Changes

Added 1 files
  • phonon/phononconfig_p.h.in
Modified 7 files
  •   CMakeLists.txt
  •   phonon/audiooutput.cpp
  •   phonon/audiooutput_p.h
  •   phonon/audiooutputadaptor.cpp
  •   phonon/audiooutputadaptor_p.h
  •   phonon/CMakeLists.txt
  •   phonon/factory.cpp
8 files changed in total