diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/corelib/doc | |
parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'src/corelib/doc')
-rw-r--r-- | src/corelib/doc/src/objectmodel/objecttrees.qdoc | 4 | ||||
-rw-r--r-- | src/corelib/doc/src/plugins-howto.qdoc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/doc/src/objectmodel/objecttrees.qdoc b/src/corelib/doc/src/objectmodel/objecttrees.qdoc index 86b8d0ee31..407f4ce3e0 100644 --- a/src/corelib/doc/src/objectmodel/objecttrees.qdoc +++ b/src/corelib/doc/src/objectmodel/objecttrees.qdoc @@ -42,13 +42,13 @@ (keyboard shortcut) is a child of the relevant window, so when the user closes that window, the shortcut is deleted too. - \l QQuickItem, the basic visual element of the QtQuick module, inherits + \l QQuickItem, the basic visual element of the Qt Quick 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, + \l QWidget, the fundamental class of the Qt Widgets 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, diff --git a/src/corelib/doc/src/plugins-howto.qdoc b/src/corelib/doc/src/plugins-howto.qdoc index b547b738f1..af15d94af2 100644 --- a/src/corelib/doc/src/plugins-howto.qdoc +++ b/src/corelib/doc/src/plugins-howto.qdoc @@ -69,7 +69,7 @@ Since the higher-level API is built on top of the lower-level API, some issues are common to both. - If you want to provide plugins for use with Qt Designer, see the QtDesigner + If you want to provide plugins for use with Qt Designer, see the Qt Designer module documentation. Topics: |