diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-09 08:16:51 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-07-09 08:16:51 +0000 |
| commit | b4cc1fc862df43d9fed90b25ee2a9ef6692d2a5a (patch) | |
| tree | 63180f4200431520ea3a2233222fa0620ea85cf2 /src/quicktemplates2/qquickpopup.cpp | |
| parent | 7c284809df7e8f1a2adbee1d768a07d13f0403cc (diff) | |
| parent | 1db5df5a73d9cc7dfe24c07ea4f4d30ed377861b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
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); } |