[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-382-gedb506b

[Brad King]

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  edb506b8625ac06cd73c0b1b2696ac4bb65d184a (commit)
       via  71a11252e95797113ecb1a969386f496b7d4861b (commit)
       via  261acd91093ba5f2bf79f38a9632887ab2dd5f1c (commit)
      from  098a39f21c140c69bed26dc6914591c76b69c7e2 (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=edb506b8625ac06cd73c0b1b2696ac4bb65d184a
commit edb506b8625ac06cd73c0b1b2696ac4bb65d184a
Merge: 098a39f 71a1125
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 26 13:24:43 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 26 13:24:43 2014 -0400

    Merge topic 'fix-Qt-Autogen'
    
    71a11252 QtAutogen: Fix use of multiple ui files in a single target.
    261acd91 QtAutogen: Use the basename for resource files.


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

Summary of changes:
 Source/cmQtAutoGenerators.cxx                       |   13 +++++++++----
 Source/cmQtAutoGenerators.h                         |    2 +-
 Tests/QtAutogen/CMakeLists.txt                      |    4 ++--
 Tests/QtAutogen/resourcetester.cpp                  |    2 ++
 .../{not_generated_file.qrc => second_resource.qrc} |    2 +-
 Tests/QtAutogen/second_widget.cpp                   |   14 ++++++++++++++
 Tests/QtAutogen/second_widget.h                     |   19 +++++++++++++++++++
 Tests/QtAutogen/{calwidget.ui => second_widget.ui}  |    8 ++++----
 8 files changed, 52 insertions(+), 12 deletions(-)
 copy Tests/QtAutogen/{not_generated_file.qrc => second_resource.qrc} (71%)
 create mode 100644 Tests/QtAutogen/second_widget.cpp
 create mode 100644 Tests/QtAutogen/second_widget.h
 copy Tests/QtAutogen/{calwidget.ui => second_widget.ui} (84%)


hooks/post-receive
-- 
CMake