diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-27 15:19:28 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-27 15:19:28 (GMT) |
| commit | 162892030766ffe8711888ea9e8d3a368c6a75b2 (patch) | |
| tree | ddfda2e163fdce5d7ead7ac1fbd7aedb4bb06b79 /doc/src/snippets/code | |
| parent | 0bc91ae61b07751f44210e1b772679c0a180c900 (diff) | |
| parent | 26b8b6783afe2c1c9f27c935eb46c05229757af1 (diff) | |
| download | Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.zip Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.tar.gz Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.tar.bz2 | |
Merge branch '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] |