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 65109d61f0319907c0ca946e4a38d171d47e26fb (commit)
via 656716d79478da65f624ef66532dc14c4d41f20a (commit)
from ab621fcd625293241596001fc935c0e04b81894c (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=65109d61f0319907c0ca946e4a38d171d47e26fb
commit 65109d61f0319907c0ca946e4a38d171d47e26fb
Merge: ab621fc 656716d
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Oct 23 09:05:00 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Oct 23 09:05:00 2013 -0400
Merge topic 'qt4-svg-dep' into next
656716d qt4: Fix linking with QtSvg to not include QtXml.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=656716d79478da65f624ef66532dc14c4d41f20a
commit 656716d79478da65f624ef66532dc14c4d41f20a
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Oct 23 07:03:18 2013 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Wed Oct 23 07:04:02 2013 -0600
qt4: Fix linking with QtSvg to not include QtXml.
Fixes issue #14505.
diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake
index 35090fc..aa036b7 100644
--- a/Modules/UseQt4.cmake
+++ b/Modules/UseQt4.cmake
@@ -63,7 +63,7 @@ endif ()
# list dependent modules, so dependent libraries are added
set(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
-set(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
+set(QT_QTSVG_MODULE_DEPENDS QTGUI QTCORE)
set(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
set(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
if(QT_QTDBUS_FOUND)
-----------------------------------------------------------------------
Summary of changes:
Modules/UseQt4.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
