diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-07 01:35:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-02-07 01:35:46 +0100 |
| commit | f0cd88c0d7af9a477bf90545975d289915e89033 (patch) | |
| tree | 40d16da8a9d35a92b72d7612156a606b83dd7a12 /src/templates/qquickstackview.cpp | |
| parent | 66487fec4c558d8b77dd0573e524a61d11e33c2a (diff) | |
| parent | 4d0294352f975c3916dfbba48f21e5b76da432c0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/imports/controls/universal/ToolButton.qml
Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
Diffstat (limited to 'src/templates/qquickstackview.cpp')
| -rw-r--r-- | src/templates/qquickstackview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp index b338f3bf..e60e2dfd 100644 --- a/src/templates/qquickstackview.cpp +++ b/src/templates/qquickstackview.cpp @@ -931,6 +931,7 @@ QQuickStackAttached::~QQuickStackAttached() /*! \qmlattachedproperty int Qt.labs.controls::StackView::index + \readonly This attached property holds the stack index of the item it's attached to, or \c -1 if the item is not in a stack. @@ -943,6 +944,7 @@ int QQuickStackAttached::index() const /*! \qmlattachedproperty StackView Qt.labs.controls::StackView::view + \readonly This attached property holds the stack view of the item it's attached to, or \c null if the item is not in a stack. @@ -955,6 +957,7 @@ QQuickStackView *QQuickStackAttached::view() const /*! \qmlattachedproperty enumeration Qt.labs.controls::StackView::status + \readonly This attached property holds the stack status of the item it's attached to, or \c StackView.Inactive if the item is not in a stack. |