diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-06 22:13:27 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-06 22:13:27 +0200 |
| commit | 2784902b9b42de127c0903c3d6b076297cf47a07 (patch) | |
| tree | 3b95b5cdf61c951f7d54fccf47b14a0ccbce7e6c /src/quicktemplates2/qquickpopup.cpp | |
| parent | 0a96b436d9845899888f7c7d153f0d9909ce4c06 (diff) | |
| parent | f8224c9c9e3dfc1fd4cc3bff915e7e2d1c411d05 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I4a07d331163a85a0fb98a5f58f3970863f8da0fc
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 9b541803..8c37ea84 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -176,7 +176,7 @@ QT_BEGIN_NAMESPACE This signal is emitted when the popup is opened. - \sa closed + \sa aboutToShow() */ /*! @@ -184,7 +184,23 @@ QT_BEGIN_NAMESPACE This signal is emitted when the popup is closed. - \sa opened + \sa aboutToHide() +*/ + +/*! + \qmlsignal void QtQuick.Controls::Popup::aboutToShow() + + This signal is emitted when the popup is about to show. + + \sa opened() +*/ + +/*! + \qmlsignal void QtQuick.Controls::Popup::aboutToHide() + + This signal is emitted when the popup is about to hide. + + \sa closed() */ QQuickPopupPrivate::QQuickPopupPrivate() |