diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 17:16:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 17:16:59 +0100 |
| commit | ff4ad44b693f2aab8de52978a12f1bb27f546698 (patch) | |
| tree | 0d4bf10b0bf019b4d3ed5176c846935ee578b342 /src/widgets/widgets/qmenu.cpp | |
| parent | 982da20cf2b58dd6f42e70d406c37219ea204a78 (diff) | |
| parent | 54b8c27e03d04c1e5cd35f75d5c0a8111240eb74 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
configure
Change-Id: I0d31f23483ea67c4cac5af16014366e1ba5ac093
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 3a4fd449c8..0cbd1c720c 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1834,6 +1834,14 @@ 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 |