diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-09 08:25:38 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-09 08:26:10 +0200 |
| commit | 1db5df5a73d9cc7dfe24c07ea4f4d30ed377861b (patch) | |
| tree | ff1d62ff1043a43484d6b069a7bbadfe26a5719f /src/quicktemplates2/qquickpopup.cpp | |
| parent | cbfa64fd84cab95d909371a5e44146928e403c05 (diff) | |
| parent | 38f7d855f2485cfb6a3a4328c1d31bac44ee0ae0 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ifff470774347041d1638fb1da277a8cc11a00db6
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 25ab2b42..2c661a1b 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -231,8 +231,8 @@ void QQuickPopupPrivate::finalizeEnterTransition() void QQuickPopupPrivate::finalizeExitTransition(bool hide) { Q_Q(QQuickPopup); - positioner.setParentItem(nullptr); if (hide) { + positioner.setParentItem(nullptr); popupItem->setParentItem(nullptr); popupItem->setVisible(false); } |