summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-14 14:48:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-14 14:48:41 (GMT)
commit1b11f2616062910ef3510344dcf1fd2e8e411dcd (patch)
tree0d75386e4fdba674146829978fcae6a81dc4457c
parenteb3b1be77f4a8037896c0d463ef09a9172939f69 (diff)
parent504666b545deafa3319ff699eff74eacc8d8559c (diff)
downloadQt-1b11f2616062910ef3510344dcf1fd2e8e411dcd.zip
Qt-1b11f2616062910ef3510344dcf1fd2e8e411dcd.tar.gz
Qt-1b11f2616062910ef3510344dcf1fd2e8e411dcd.tar.bz2
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixed snippet documenting QMetaObject::classInfo
-rw-r--r--doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp
index 7a752b1..86bad5e 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp
@@ -43,7 +43,7 @@ void wrapInFunction()
{
//! [0]
-class MyClass
+class MyClass : public QObject
{
Q_OBJECT
Q_CLASSINFO("author", "Sabrina Schweinsteiger")