summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-03-18 09:41:55 -0400
committerCMake Topic Stage <kwrobot@kitware.com>2013-03-18 09:41:55 -0400
commit85f7caabbba5319c561b75db7bbb7562789af2dd (patch)
tree0b29fa94429a3242e93e318926cf2e46529d2f55
parent758651f124caff93889121c88cb193c3b63df1ba (diff)
parent1b386b3407c5b0ca117253d93a815061a821413d (diff)
downloadcmake-85f7caabbba5319c561b75db7bbb7562789af2dd.tar.gz
Merge topic 'CMAKE_AUTOMOC-Qt5-docs'
1b386b3 Document that CMAKE_AUTOMOC works with Qt 5.
-rw-r--r--Source/cmTarget.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e0d7fa4250..56eb4ad49a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -193,7 +193,8 @@ void cmTarget::DefineProperties(cmake *cm)
"Should the target be processed with automoc (for Qt projects).",
"AUTOMOC is a boolean specifying whether CMake will handle "
"the Qt moc preprocessor automatically, i.e. without having to use "
- "the QT4_WRAP_CPP() macro. Currently Qt4 is supported. "
+ "the QT4_WRAP_CPP() or QT5_WRAP_CPP() macro. Currently Qt4 and Qt5 are "
+ "supported. "
"When this property is set to TRUE, CMake will scan the source files "
"at build time and invoke moc accordingly. "
"If an #include statement like #include \"moc_foo.cpp\" is found, "