[Cmake-commits] CMake branch, next, updated. v2.8.6-2070-g4595712

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  45957128b9f0947f69e82ca35e58776a77de301d (commit)
       via  3cd08ce0489b95e75004fd8a26c2cfcf57cbf49b (commit)
      from  db1f77698c1314c5181204b08fcf7ad538dac296 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45957128b9f0947f69e82ca35e58776a77de301d
commit 45957128b9f0947f69e82ca35e58776a77de301d
Merge: db1f776 3cd08ce
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Nov 29 11:03:15 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 29 11:03:15 2011 -0500

    Merge topic 'useqt4-fix-declarative' into next
    
    3cd08ce Qt4: Fix dependencies of QtDeclartive.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cd08ce0489b95e75004fd8a26c2cfcf57cbf49b
commit 3cd08ce0489b95e75004fd8a26c2cfcf57cbf49b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Nov 29 09:02:40 2011 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Nov 29 09:02:40 2011 -0700

    Qt4: Fix dependencies of QtDeclartive.

diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake
index b824392..027504f 100644
--- a/Modules/UseQt4.cmake
+++ b/Modules/UseQt4.cmake
@@ -68,7 +68,7 @@ SET(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE)
-SET(QT_QTDECLARATIVE_MODULE_DEPENDS QTWEBKIT QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTXML QTOPENGL QTGUI QTNETWORK QTCORE)
+SET(QT_QTDECLARATIVE_MODULE_DEPENDS QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTGUI QTCORE)
 SET(QT_QTMULTIMEDIA_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QTOPENGL_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QTSCRIPT_MODULE_DEPENDS QTCORE)
@@ -81,8 +81,8 @@ SET(QT_QTNETWORK_MODULE_DEPENDS QTCORE)
 # Qt modules  (in order of dependence)
 FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
                QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP
-               QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTGUI QTTEST QTDBUS QTXML QTSQL
-               QTXMLPATTERNS QTNETWORK QTCORE)
+               QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTXMLPATTERNS QTGUI QTTEST
+               QTDBUS QTXML QTSQL QTNETWORK QTCORE)
 
   IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
     IF (QT_${module}_FOUND)

-----------------------------------------------------------------------

Summary of changes:
 Modules/UseQt4.cmake |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake