diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-06-28 12:04:30 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-07-01 10:25:58 +0200 |
| commit | df295d70421f068a567d0e37784bf7a1def56073 (patch) | |
| tree | eff20b95fd529c76a8ab7e2c4db26a76fae5fa7b /src/controls/qquickmenupopupwindow_p.h | |
| parent | ce8e6301b4a80eebb081c8713fe8462bcc211351 (diff) | |
| download | qtquickcontrols-df295d70421f068a567d0e37784bf7a1def56073.tar.gz | |
Use the correct parent window for menu popups
The previous fix applied only to the non-platform menu case and was
broken on OS X at least, when having a combobox in a QQuickWidget.
Task-number: QTBUG-39908
Change-Id: I5dde103c2fe33d52a312cc80b36b47b13e72a188
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/qquickmenupopupwindow_p.h')
| -rw-r--r-- | src/controls/qquickmenupopupwindow_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/qquickmenupopupwindow_p.h b/src/controls/qquickmenupopupwindow_p.h index 1e824bea..a550daa2 100644 --- a/src/controls/qquickmenupopupwindow_p.h +++ b/src/controls/qquickmenupopupwindow_p.h @@ -53,7 +53,7 @@ public: QQuickMenuPopupWindow(); void setItemAt(QQuickItem *menuItem); - void setParentWindow(QQuickWindow *parentWindow); + void setParentWindow(QWindow *effectiveParentWindow, QQuickWindow *parentWindow); void setGeometry(int posx, int posy, int w, int h); void setParentItem(QQuickItem *); |