diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/quick/items/qquickitem.cpp | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 73fc12babd..01413385d9 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -114,7 +114,7 @@ void debugFocusTree(QQuickItem *item, QQuickItem *scope = nullptr, int depth = 1 \instantiates QQuickTransform \inqmlmodule QtQuick \ingroup qtquick-visual-transforms - \brief For specifying advanced transformations on Items + \brief For specifying advanced transformations on Items. The Transform type is a base type which cannot be instantiated directly. The following concrete Transform types are available: @@ -357,7 +357,7 @@ void QQuickItemKeyFilter::componentComplete() \instantiates QQuickKeyNavigationAttached \inqmlmodule QtQuick \ingroup qtquick-input - \brief Supports key navigation by arrow keys + \brief Supports key navigation by arrow keys. Key-based user interfaces commonly allow the use of arrow keys to navigate between focusable items. The KeyNavigation attached property enables this behavior by providing a @@ -816,7 +816,7 @@ bool QQuickKeysAttached::isConnected(const char *signalName) const \instantiates QQuickKeysAttached \inqmlmodule QtQuick \ingroup qtquick-input - \brief Provides key handling to Items + \brief Provides key handling to Items. All visual primitives support key handling via the Keys attached property. Keys can be handled via the onPressed @@ -1507,7 +1507,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj) \inqmlmodule QtQuick \ingroup qtquick-positioners \ingroup qml-utility-elements - \brief Property used to mirror layout behavior + \brief Property used to mirror layout behavior. The LayoutMirroring attached property is used to horizontally mirror \l {anchor-layout}{Item anchors}, \l{Item Positioners}{positioner} types (such as \l Row and \l Grid) @@ -1924,7 +1924,7 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus) \inherits QtObject \inqmlmodule QtQuick \ingroup qtquick-visual - \brief A basic visual QML type + \brief A basic visual QML type. The Item type is the base type for all visual items in Qt Quick. |