diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2009-08-27 07:41:32 (GMT) |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2009-08-27 07:41:32 (GMT) |
| commit | 443f281bc4643253ea737fd5b7290b637eb4cac5 (patch) | |
| tree | 44709dead785c86765d0a97f5c39ee54a40ab047 /doc/src/snippets/code | |
| parent | 4416b759996fd1de6dd1757e8e8f1c62e182fbce (diff) | |
| parent | fbef539a2a1ec5469b61ea69e72a0538e129e1a4 (diff) | |
| download | Qt-443f281bc4643253ea737fd5b7290b637eb4cac5.zip Qt-443f281bc4643253ea737fd5b7290b637eb4cac5.tar.gz Qt-443f281bc4643253ea737fd5b7290b637eb4cac5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp index 5c0f80c..a02d4e9 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp @@ -39,10 +39,10 @@ timer->inherits("QTimer"); // returns true timer->inherits("QObject"); // returns true timer->inherits("QAbstractButton"); // returns false -// QLayout inherits QObject and QLayoutItem -QLayout *layout = new QLayout; +// QVBoxLayout inherits QObject and QLayoutItem +QVBoxLayout *layout = new QVBoxLayout; layout->inherits("QObject"); // returns true -layout->inherits("QLayoutItem"); // returns false +layout->inherits("QLayoutItem"); // returns true (even though QLayoutItem is not a QObject) //! [4] |