Merge branch 4.7 into qt-4.8-from-4.7

7 files changed, 31 insertions, 0 deletions

diff --git a/demos/deform/main.cpp b/demos/deform/main.cpp
index c49117a..d92ddba 100644
--- a/demos/deform/main.cpp
+++ b/demos/deform/main.cpp
@@ -50,7 +50,11 @@ int main(int argc, char **argv)
 
     QApplication app(argc, argv);
 
+#ifdef Q_OS_SYMBIAN
+    bool smallScreen = true;
+#else
     bool smallScreen = QApplication::arguments().contains("-small-screen");
+#endif
 
     PathDeformWidget deformWidget(0, smallScreen);
 
diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp
index b357f99..ca201d3 100644
--- a/demos/pathstroke/main.cpp
+++ b/demos/pathstroke/main.cpp
@@ -48,7 +48,11 @@ int main(int argc, char **argv)
 
     QApplication app(argc, argv);
 
+#ifdef Q_OS_SYMBIAN
+    bool smallScreen = true;
+#else
     bool smallScreen = QApplication::arguments().contains("-small-screen");
+#endif
 
     PathStrokeWidget pathStrokeWidget(smallScreen);
     QStyle *arthurStyle = new ArthurStyle();
diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp
index 1166abb..e87ef5b 100644
--- a/examples/draganddrop/fridgemagnets/main.cpp
+++ b/examples/draganddrop/fridgemagnets/main.cpp
@@ -51,7 +51,12 @@ int main(int argc, char *argv[])
 #endif
     DragWidget window;
 
+#ifdef Q_OS_SYMBIAN
+    bool smallScreen = true;
+#else
     bool smallScreen = QApplication::arguments().contains("-small-screen");
+#endif
+
     if (smallScreen)
         window.showFullScreen();
     else
diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index 3d56910..20df178 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -48,7 +48,12 @@ int main(int argc, char **argv)
     QApplication app(argc, argv);
     Window win;
 
+#ifdef Q_OS_SYMBIAN
+    bool smallScreen = true;
+#else
     bool smallScreen = QApplication::arguments().contains("-small-screen");
+#endif
+
     if (!smallScreen) {
         win.show();
     } else {
diff --git a/examples/widgets/wiggly/main.cpp b/examples/widgets/wiggly/main.cpp
index 91cd1b8..7ba6d36 100644
--- a/examples/widgets/wiggly/main.cpp
+++ b/examples/widgets/wiggly/main.cpp
@@ -45,7 +45,11 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+#ifdef Q_OS_SYMBIAN
+    bool smallScreen = true;
+#else
     bool smallScreen = QApplication::arguments().contains("-small-screen");
+#endif
 
     Dialog dialog(0, smallScreen);
 
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index c9d7269..3407502 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -874,6 +874,8 @@ void QCoeFepInputContext::ensureInputCapabilitiesChanged()
 void QCoeFepInputContext::translateInputWidget()
 {
     QGraphicsView *gv = qobject_cast<QGraphicsView *>(S60->splitViewLastWidget);
+    if (!gv)
+        return;
     QRect splitViewRect = qt_TRect2QRect(static_cast<CEikAppUi*>(S60->appUi())->ClientRect());
 
     QRectF cursor = gv->scene()->inputMethodQuery(Qt::ImMicroFocus).toRectF();
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) {