[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-868-g64f718b

Brad King brad.king at kitware.com
Tue Nov 1 14:08:13 EDT 2016


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  64f718b310bbf299959b5b91949ade424e68ee1b (commit)
       via  ff11989cc3f11ebaf0584ac4fba44c67222ffbcc (commit)
      from  23378e88aca447aacce995fb6433cb25ba958c9a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64f718b310bbf299959b5b91949ade424e68ee1b
commit 64f718b310bbf299959b5b91949ade424e68ee1b
Merge: 23378e8 ff11989
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 1 14:08:11 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 1 14:08:11 2016 -0400

    Merge topic 'find-qt5-docs' into next
    
    ff11989c Help: Update example Qt 5 find_package call to use COMPONENTS


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff11989cc3f11ebaf0584ac4fba44c67222ffbcc
commit ff11989cc3f11ebaf0584ac4fba44c67222ffbcc
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Tue Nov 1 12:44:34 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 1 14:06:49 2016 -0400

    Help: Update example Qt 5 find_package call to use COMPONENTS

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index e8a2c1e..bd0a984 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -29,7 +29,7 @@ Qt 4 and Qt 5 may be used together in the same
   set(CMAKE_AUTOMOC ON)
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-  find_package(Qt5Widgets REQUIRED)
+  find_package(Qt5 COMPONENTS Widgets REQUIRED)
   add_executable(publisher publisher.cpp)
   target_link_libraries(publisher Qt5::Widgets Qt5::DBus)
 

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

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list