diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
| commit | 7d592bcbfb604b1179004e311aa6a972fab6707c (patch) | |
| tree | 92d7ea1e139c3d264dd75dc527c2113e279db9f6 /src/quicktemplates2/qquickstackview.cpp | |
| parent | f57f2d9e45b177232b76bde07ff96ef3e43fe5b1 (diff) | |
| parent | 44dd55be23138f0a6495b08818acaaa0ff68b086 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickrangeslider.cpp
Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf
Diffstat (limited to 'src/quicktemplates2/qquickstackview.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickstackview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp index 3767d143..856e2b7e 100644 --- a/src/quicktemplates2/qquickstackview.cpp +++ b/src/quicktemplates2/qquickstackview.cpp @@ -1163,7 +1163,7 @@ QQuickStackView::Status QQuickStackViewAttached::status() const } /*! - \since QtQuick.Controls 2.2 + \since QtQuick.Controls 2.2 (Qt 5.9) \qmlattachedproperty bool QtQuick.Controls::StackView::visible This attached property holds the visibility of the item it's attached to. @@ -1212,7 +1212,7 @@ void QQuickStackViewAttached::resetVisible() /*! \qmlattachedsignal QtQuick.Controls::StackView::activated() - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) This attached signal is emitted when the item it's attached to is activated in the stack. @@ -1221,7 +1221,7 @@ void QQuickStackViewAttached::resetVisible() /*! \qmlattachedsignal QtQuick.Controls::StackView::deactivated() - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) This attached signal is emitted when the item it's attached to is deactivated in the stack. @@ -1230,7 +1230,7 @@ void QQuickStackViewAttached::resetVisible() /*! \qmlattachedsignal QtQuick.Controls::StackView::activating() - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) This attached signal is emitted when the item it's attached to is in the process of being activated in the stack. @@ -1240,7 +1240,7 @@ void QQuickStackViewAttached::resetVisible() /*! \qmlattachedsignal QtQuick.Controls::StackView::deactivating() - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) This attached signal is emitted when the item it's attached to is in the process of being dectivated in the stack. @@ -1250,7 +1250,7 @@ void QQuickStackViewAttached::resetVisible() /*! \qmlattachedsignal QtQuick.Controls::StackView::removed() - \since QtQuick.Controls 2.1 + \since QtQuick.Controls 2.1 (Qt 5.8) This attached signal is emitted when the item it's attached to has been removed from the stack. It can be used to safely destroy an Item that was |