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 23378e88aca447aacce995fb6433cb25ba958c9a (commit)
via ecc74c41abd21ef2c0c8d34124a29f9201f06927 (commit)
from e0af67b4fc05970cea3007f0ae4b97d5e3f512d4 (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=23378e88aca447aacce995fb6433cb25ba958c9a
commit 23378e88aca447aacce995fb6433cb25ba958c9a
Merge: e0af67b ecc74c4
Author: Marcus D. Hanwell <marcus.hanw...@kitware.com>
AuthorDate: Tue Nov 1 13:41:25 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 1 13:41:25 2016 -0400
Merge topic 'find-qt5-docs' into next
ecc74c41 Update Qt 5 find_package call to use COMPONENTS
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecc74c41abd21ef2c0c8d34124a29f9201f06927
commit ecc74c41abd21ef2c0c8d34124a29f9201f06927
Author: Marcus D. Hanwell <marcus.hanw...@kitware.com>
AuthorDate: Tue Nov 1 12:44:34 2016 -0400
Commit: Marcus D. Hanwell <marcus.hanw...@kitware.com>
CommitDate: Tue Nov 1 12:44:34 2016 -0400
Update 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:
Help/manual/cmake-qt.7.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
