diff options
| author | Paul Olav Tvete <paul.tvete@digia.com> | 2012-11-22 16:57:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 10:08:10 +0100 |
| commit | d29421dbe3ba5892e12dd1aaf5e52ff891b5491d (patch) | |
| tree | 991829abdd7aad173d1b1fb1e80246d4acc9863b /src/corelib | |
| parent | 490379a3e3c94c9e69f34b0c2b688608bb319f42 (diff) | |
Make QtQuick documentation references work
...and add one where we used to say that QWidget is "the base
class of everything that appears on the screen".
Change-Id: I573d8162fd69b7bfc5b0305f3ed6530129386b78
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/doc/qtcore.qdocconf | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/objectmodel/objecttrees.qdoc | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index 6172799487..bfb473d65c 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -24,7 +24,7 @@ qhp.QtCore.subprojects.classes.sortPages = true tagfile = ../../../doc/qtcore/qtcore.tags -depends += qtgui qtwidgets qtnetwork qtdoc +depends += qtgui qtwidgets qtnetwork qtdoc qtquick headerdirs += .. diff --git a/src/corelib/doc/src/objectmodel/objecttrees.qdoc b/src/corelib/doc/src/objectmodel/objecttrees.qdoc index fd78a7cb22..f3b8864e7f 100644 --- a/src/corelib/doc/src/objectmodel/objecttrees.qdoc +++ b/src/corelib/doc/src/objectmodel/objecttrees.qdoc @@ -40,9 +40,15 @@ is deleted when the parent is. It turns out that this approach fits the needs of GUI objects very well. For example, a \l QShortcut (keyboard shortcut) is a child of the relevant window, so when the - user closes that window, the shorcut is deleted too. + user closes that window, the shortcut is deleted too. - \l QWidget, the base class of everything that appears on the screen, + \l QQuickItem, the basic visual element of the QtQuick module, inherits + from QObject, but has a concept of the \e {visual parent} which + differs from that of the \e {QObject parent}. An item's visual parent + may not necessarily be the same as its object parent. See + \l {Concepts - Visual Parent in Qt Quick} for more details. + + \l QWidget, the fundamental class of the QtWidgets module, extends the parent-child relationship. A child normally also becomes a child widget, i.e. it is displayed in its parent's coordinate system and is graphically clipped by its parent's boundaries. For example, |