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, master has been updated
via 6d4e79e2c361084ae26a8961ac9936052d68fde9 (commit)
via fa55751f83dc5d5bd5f80d12c3076ec703262edb (commit)
via f77631672168b1e3b5fad93c2bb83db65cb67e7b (commit)
from 3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d (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=6d4e79e2c361084ae26a8961ac9936052d68fde9
commit 6d4e79e2c361084ae26a8961ac9936052d68fde9
Merge: 3caf565 fa55751
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 3 09:57:01 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 3 09:57:01 2013 -0400
Merge topic 'qt4-qt5-CMAKE_AUTOMOC'
fa55751 QtAutomoc: Get the Qt version through the target link interface
f776316 Use the qt5::moc imported target instead of a variable.
-----------------------------------------------------------------------
Summary of changes:
Modules/AutomocInfo.cmake.in | 5 +--
Source/cmQtAutomoc.cxx | 40 +++++++++++++++++++++++++++++++++++
Tests/CMakeLists.txt | 14 ++++++++++++
Tests/Qt4And5Automoc/CMakeLists.txt | 13 +++++++++++
Tests/Qt4And5Automoc/main.cpp | 18 +++++++++++++++
Tests/Qt4And5Automoc/main_qt4.cpp | 4 +++
Tests/Qt4And5Automoc/main_qt5.cpp | 4 +++
7 files changed, 95 insertions(+), 3 deletions(-)
create mode 100644 Tests/Qt4And5Automoc/CMakeLists.txt
create mode 100644 Tests/Qt4And5Automoc/main.cpp
create mode 100644 Tests/Qt4And5Automoc/main_qt4.cpp
create mode 100644 Tests/Qt4And5Automoc/main_qt5.cpp
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
