Revert "Android: Use native platform menus."

This reverts commit 98f0b46689.

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>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2013-11-25 13:13:11 +01:00 committed by The Qt Project
parent b61928e646
commit 7201148be0

View File

@ -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