diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 16:08:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 16:08:38 (GMT) |
| commit | c6a8f35846df86a87591372d022e54a701591f5b (patch) | |
| tree | 471f5eb02ccee400c2587e8b3fae55b922d848d1 /src/gui/kernel/qapplication_s60.cpp | |
| parent | d4c00ffb6f01a991118388957de831394c8ad9c1 (diff) | |
| parent | 1dd89b6ad0546f247486b63f72035baf21475b51 (diff) | |
| download | Qt-c6a8f35846df86a87591372d022e54a701591f5b.zip Qt-c6a8f35846df86a87591372d022e54a701591f5b.tar.gz Qt-c6a8f35846df86a87591372d022e54a701591f5b.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/kernel/qapplication_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index d607433..3208cd7 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -2265,6 +2265,7 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent #if defined(Q_SYMBIAN_SUPPORTS_MULTIPLE_SCREENS) case EEventDisplayChanged: #endif + { if (callSymbianEventFilters(symbianEvent)) return 1; if (S60) @@ -2276,6 +2277,12 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent QResizeEvent e(qt_desktopWidget->size(), oldSize); QApplication::sendEvent(qt_desktopWidget, &e); } + // Close non-native QMenus (that should act like context menus, i.e. close + // automatically when the orientation changes). + QMenu *activeMenu = qobject_cast<QMenu *>(QApplication::activePopupWidget()); + if (activeMenu) + activeMenu->close(); + } return 0; // Propagate to CONE case EEventWindowVisibilityChanged: if (controlInMap) { |