[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-755-ga196adb

[Stephen Kelly]

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  a196adb2366e4569fb7a53aa2a3aa226efdf290d (commit)
       via  fc2bad57fffc671025a86e23fb29dcb0fd4a7aed (commit)
      from  4cb237c06e3201d43060226ff9072075a5e252d2 (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=a196adb2366e4569fb7a53aa2a3aa226efdf290d
commit a196adb2366e4569fb7a53aa2a3aa226efdf290d
Merge: 4cb237c fc2bad5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 10 06:52:10 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 10 06:52:10 2014 -0400

    Merge topic 'fix-Qt4-DBus-macro' into next
    
    fc2bad57 Qt4: Use correct qdbus executable in macro.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc2bad57fffc671025a86e23fb29dcb0fd4a7aed
commit fc2bad57fffc671025a86e23fb29dcb0fd4a7aed
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 10 11:49:58 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 10 11:50:28 2014 +0100

    Qt4: Use correct qdbus executable in macro.
    
    Commit v3.0.0-rc1~71^2~9 (Qt4: Use IMPORTED executable names with
    custom commands., 2014-01-24) erroneusly changed this command to
    use the wrong target.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index df2318b..8baf896 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -342,7 +342,7 @@ macro(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optional
 
   if(_optionalClassName)
     add_custom_command(OUTPUT "${_impl}" "${_header}"
-       COMMAND Qt4::qdbuscpp2xml -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
+       COMMAND Qt4::qdbusxml2cpp -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
        DEPENDS ${_infile} VERBATIM
     )
   else()

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

Summary of changes:
 Modules/Qt4Macros.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake