summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-06-05 18:20:47 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-06-05 18:20:47 (GMT)
commitb0a8bc364d583d282ffb27d87d60d6a67ba5d00d (patch)
tree1ba084b4fe7b8fb7474d7cb83554d60ad6cccd76 /Modules
parent8d8e5a962685a349a281b7eed059b6bd2678b153 (diff)
parentad7c80cd9f5b50f39e32f1874a3c1ec4b2e82c44 (diff)
downloadCMake-b0a8bc364d583d282ffb27d87d60d6a67ba5d00d.zip
CMake-b0a8bc364d583d282ffb27d87d60d6a67ba5d00d.tar.gz
CMake-b0a8bc364d583d282ffb27d87d60d6a67ba5d00d.tar.bz2
Merge topic 'qt4-phonon-backend'
ad7c80c Added conditional for the phonon backend plugin.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindQt4.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index f9db5e1..391797e 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1059,7 +1059,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
SET( QT_IMAGEFORMATS_PLUGINS qgif qjpeg qmng qico qsvg qtiff )
SET( QT_INPUTMETHODS_PLUGINS qimsw_multi )
SET( QT_MOUSEDRIVERS_PLUGINS qwstslibmousehandler )
- SET( QT_PHONON_BACKEND_PLUGINS phonon_qt7 )
+ IF(APPLE)
+ SET( QT_PHONON_BACKEND_PLUGINS phonon_qt7 )
+ ELSEIF(WIN32)
+ SET( QT_PHONON_BACKEND_PLUGINS phonon_ds9 )
+ ENDIF()
SET( QT_SCRIPT_PLUGINS qtscriptdbus )
SET( QT_SQLDRIVERS_PLUGINS qsqldb2 qsqlibase qsqlite qsqlite2 qsqlmysql qsqloci qsqlodbc qsqlpsql qsqltds )