[Cmake-commits] [cmake-commits] alex committed FindQt4.cmake 1.182 1.183

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14863

Modified Files:
	FindQt4.cmake 
Log Message:
-add support for QtMultimedia and some sync with KDE

-the QtMultimedia module is new since Qt 4.6.0
-sort the doc entries alphabetically

Alex


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.182
retrieving revision 1.183
diff -C 2 -d -r1.182 -r1.183
*** FindQt4.cmake	16 Dec 2009 22:16:59 -0000	1.182
--- FindQt4.cmake	20 Dec 2009 14:06:42 -0000	1.183
***************
*** 35,38 ****
--- 35,39 ----
  #                    QT_USE_QTMOTIF
  #                    QT_USE_QTMAIN
+ #                    QT_USE_QTMULTIMEDIA
  #                    QT_USE_QTNETWORK
  #                    QT_USE_QTNSPLUGIN
***************
*** 152,155 ****
--- 153,157 ----
  #  QT_QT3SUPPORT_FOUND      True if Qt3Support was found.
  #  QT_QTASSISTANT_FOUND     True if QtAssistant was found.
+ #  QT_QTASSISTANTCLIENT_FOUND  True if QtAssistantClient was found.
  #  QT_QAXCONTAINER_FOUND    True if QAxContainer was found (Windows only).
  #  QT_QAXSERVER_FOUND       True if QAxServer was found (Windows only).
***************
*** 157,176 ****
  #  QT_QTDESIGNER_FOUND      True if QtDesigner was found.
  #  QT_QTDESIGNERCOMPONENTS  True if QtDesignerComponents was found.
  #  QT_QTMOTIF_FOUND         True if QtMotif was found.
  #  QT_QTNETWORK_FOUND       True if QtNetwork was found.
  #  QT_QTNSPLUGIN_FOUND      True if QtNsPlugin was found.
  #  QT_QTOPENGL_FOUND        True if QtOpenGL was found.
  #  QT_QTSQL_FOUND           True if QtSql was found.
- #  QT_QTXML_FOUND           True if QtXml was found.
  #  QT_QTSVG_FOUND           True if QtSvg was found.
  #  QT_QTSCRIPT_FOUND        True if QtScript was found.
  #  QT_QTTEST_FOUND          True if QtTest was found.
  #  QT_QTUITOOLS_FOUND       True if QtUiTools was found.
- #  QT_QTASSISTANTCLIENT_FOUND  True if QtAssistantClient was found.
- #  QT_QTHELP_FOUND          True if QtHelp was found.
  #  QT_QTWEBKIT_FOUND        True if QtWebKit was found.
  #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
  #  QT_PHONON_FOUND          True if phonon was found.
- #  QT_QTSCRIPTTOOLS_FOUND   True if QtScriptTools was found.
  #
  #  QT_MAC_USE_COCOA    For Mac OS X, its whether Cocoa or Carbon is used.
--- 159,178 ----
  #  QT_QTDESIGNER_FOUND      True if QtDesigner was found.
  #  QT_QTDESIGNERCOMPONENTS  True if QtDesignerComponents was found.
+ #  QT_QTHELP_FOUND          True if QtHelp was found.
  #  QT_QTMOTIF_FOUND         True if QtMotif was found.
+ #  QT_QTMULTIMEDIA_FOUND    True if QtMultimedia was found (since Qt 4.6.0).
  #  QT_QTNETWORK_FOUND       True if QtNetwork was found.
  #  QT_QTNSPLUGIN_FOUND      True if QtNsPlugin was found.
  #  QT_QTOPENGL_FOUND        True if QtOpenGL was found.
  #  QT_QTSQL_FOUND           True if QtSql was found.
  #  QT_QTSVG_FOUND           True if QtSvg was found.
  #  QT_QTSCRIPT_FOUND        True if QtScript was found.
+ #  QT_QTSCRIPTTOOLS_FOUND   True if QtScriptTools was found.
  #  QT_QTTEST_FOUND          True if QtTest was found.
  #  QT_QTUITOOLS_FOUND       True if QtUiTools was found.
  #  QT_QTWEBKIT_FOUND        True if QtWebKit was found.
+ #  QT_QTXML_FOUND           True if QtXml was found.
  #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
  #  QT_PHONON_FOUND          True if phonon was found.
  #
  #  QT_MAC_USE_COCOA    For Mac OS X, its whether Cocoa or Carbon is used.
***************
*** 208,211 ****
--- 210,214 ----
  #  QT_QTHELP_INCLUDE_DIR       Path to "include/QtHelp"
  #  QT_QTMOTIF_INCLUDE_DIR      Path to "include/QtMotif" 
+ #  QT_QTMULTIMEDIA_INCLUDE_DIR Path to "include/QtMultimedia" 
  #  QT_QTNETWORK_INCLUDE_DIR    Path to "include/QtNetwork" 
  #  QT_QTNSPLUGIN_INCLUDE_DIR   Path to "include/QtNsPlugin" 
***************
*** 227,231 ****
  #  QT_DOC_DIR                  Path to "doc" of Qt4
  #  QT_MKSPECS_DIR              Path to "mkspecs" of Qt4
! #                            
  #
  # The Qt toolkit may contain both debug and release libraries.
--- 230,234 ----
  #  QT_DOC_DIR                  Path to "doc" of Qt4
  #  QT_MKSPECS_DIR              Path to "mkspecs" of Qt4
! #
  #
  # The Qt toolkit may contain both debug and release libraries.
***************
*** 246,249 ****
--- 249,253 ----
  #  QT_QTHELP_LIBRARY                The QtHelp library
  #  QT_QTMOTIF_LIBRARY               The QtMotif library
+ #  QT_QTMULTIMEDIA_LIBRARY          The QtMultimedia library
  #  QT_QTNETWORK_LIBRARY             The QtNetwork library
  #  QT_QTNSPLUGIN_LIBRARY            The QtNsPLugin library
***************
*** 622,626 ****
  
    SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
!                  QtHelp QtWebKit QtXmlPatterns phonon QtNetwork 
                   QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools)
    
--- 626,630 ----
  
    SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
!                  QtHelp QtWebKit QtXmlPatterns phonon QtNetwork QtMultimedia
                   QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools)
    
***************
*** 879,882 ****
--- 883,887 ----
    _QT4_ADJUST_LIB_VARS(QTDESIGNER)
    _QT4_ADJUST_LIB_VARS(QTDESIGNERCOMPONENTS)
+   _QT4_ADJUST_LIB_VARS(QTMULTIMEDIA)
    _QT4_ADJUST_LIB_VARS(QTNETWORK)
    _QT4_ADJUST_LIB_VARS(QTNSPLUGIN)