diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-27 03:52:16 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-27 05:10:06 (GMT) |
| commit | 62c33357cec8924f2383042c544636ec5aae1c97 (patch) | |
| tree | 3c1c6f975710807d10546631b58fb0c52bd2fb50 /doc/src/snippets/code | |
| parent | 4b112230229544b13c254acd8a10b67939c79f22 (diff) | |
| parent | c52061e7980fcde5d59a7657a254ce00d117b611 (diff) | |
| download | Qt-62c33357cec8924f2383042c544636ec5aae1c97.zip Qt-62c33357cec8924f2383042c544636ec5aae1c97.tar.gz Qt-62c33357cec8924f2383042c544636ec5aae1c97.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
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] |