diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-11-25 13:13:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-25 23:56:27 +0100 |
| commit | 7201148be075632124db3d6a4046b590dad09884 (patch) | |
| tree | 8785fa6e9de79497dbe2e9e0b21d793347b9d77c | |
| parent | b61928e646fbcdbc8367f9231e23b22cebf2e4fb (diff) | |
Revert "Android: Use native platform menus."
This reverts commit 98f0b4668999d677d8bf91d57ac095d96e7a661c.
The native menu popup would never exit its event loop, because
there's no listener for the closing of the menu. Since this is very
last minute and the change is not ready, we revert it and use
the widget menus instead.
Change-Id: Ie9ae707300a265130a90d1ccb5f093f50cc0b2fb
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 0cbd1c720c..3a4fd449c8 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1834,14 +1834,6 @@ QSize QMenu::sizeHint() const void QMenu::popup(const QPoint &p, QAction *atAction) { Q_D(QMenu); - -#ifdef Q_OS_ANDROID - if (!d->platformMenu.isNull() && !testAttribute(Qt::WA_SetStyle)) { - d->platformMenu->showPopup(window()->windowHandle(), p, 0); - return; - } -#endif - if (d->scroll) { // reset scroll state from last popup if (d->scroll->scrollOffset) d->itemsDirty = 1; // sizeHint will be incorrect if there is previous scroll |