diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ option(PHONON_NO_CAPTURE "Disable the capture capabilities") option(PHONON_NO_DBUS "Deactivate DBus support (used to expose AudioOutputs and for deprecated runtime backend switching)" OFF) -option(PHONON_BUILD_PHONON4QT5 "Build Phonon 4 transitional library for Qt5 (API compatible with regular Phonon4)" OFF) +option(PHONON_BUILD_PHONON4QT5 "Build Phonon 4 transitional library for Qt5 (API compatible with regular Phonon4)" ON) # The following variables directly influence the library's soname version. # It is highly advised to think twice before changing those. diff --git a/doc/Phonon4Qt5.dox b/doc/Phonon4Qt5.dox --- a/doc/Phonon4Qt5.dox +++ b/doc/Phonon4Qt5.dox @@ -17,8 +17,8 @@ \section phonon4qt5_building Building -To build Phonon4Qt5 you will have to pass PHONON_BUILD_PHONON4QT5 to CMake to -switch it into Qt5 build mode. +Building Phonon in Qt5 mode is controlled by the CMake variable +PHONON_BUILD_PHONON4QT5, which is enabled by default. Additionally if you are building against a qt-project provided binary build of Qt5 you may have to define the CMAKE_PREFIX_PATH to make CMake find Qt5. If you are @@ -30,7 +30,7 @@ \verbatim mkdir build5 cd build5 -cmake .. -DPHONON_BUILD_PHONON4QT5=ON -DCMAKE_PREFIX_PATH=/opt/Qt5.0.0/5.0.0/gcc_64 -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON +cmake .. -DCMAKE_PREFIX_PATH=/opt/Qt5.0.0/5.0.0/gcc_64 -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \endverbatim Phonon4Qt5 installation does not conflict with regular Phonon installations in @@ -103,4 +103,4 @@ } \endcode -*/ \ No newline at end of file +*/