diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-20 16:36:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 21:29:46 +0200 |
| commit | fc14bd2c92d42aa055ce634e246820cef426ec9c (patch) | |
| tree | 1403dd2d11621d36a4d2a7ec2e986a5b85bcbf2d /src/widgets/widgets/qmenu.cpp | |
| parent | c7df1af337e0d5a013a2f1c17bb14df083769410 (diff) | |
Widgets: Remove Q_WS_QPA and qpa-sections from .pro files.
Enable compilation without -qpa.
- Remove conditionals from Q_WS_QPA sections.
- Rename precompiled header.
- Remove gui-related Q_OS_SYMBIAN-#ifdef sections.
- Leave other Q_WS code in for reference.
Change-Id: I16326b631fff483aec8edd2f7a2e7a1822eab814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 43fff6a8cf..8b3af3fb25 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1760,12 +1760,10 @@ QSize QMenu::sizeHint() const void QMenu::popup(const QPoint &p, QAction *atAction) { Q_D(QMenu); -#ifndef Q_OS_SYMBIAN if (d->scroll) { // reset scroll state from last popup d->scroll->scrollOffset = 0; d->scroll->scrollFlags = QMenuPrivate::QMenuScroller::ScrollNone; } -#endif d->tearoffHighlighted = 0; d->motions = 0; d->doChildEffects = true; |