Fixed the qlocale manual test app on symbian.

Reviewed-by: trustme

3 files changed, 10 insertions, 3 deletions

diff --git a/tests/manual/qlocale/main.cpp b/tests/manual/qlocale/main.cpp
index b14a44f7c6..c85bd191f3 100644
--- a/tests/manual/qlocale/main.cpp
+++ b/tests/manual/qlocale/main.cpp
@@ -46,6 +46,10 @@ int main(int argv, char *args[])
 {
     QApplication app(argv, args);
     Window window;
+#if !defined(Q_OS_SYMBIAN)
     window.show();
+#else
+    window.showFullScreen();
+#endif
     return app.exec();
 }
diff --git a/tests/manual/qlocale/window.cpp b/tests/manual/qlocale/window.cpp
index fae88a3fde..89e3ec6b57 100644
--- a/tests/manual/qlocale/window.cpp
+++ b/tests/manual/qlocale/window.cpp
@@ -83,7 +83,8 @@ Window::Window()
     headerLayout->addWidget(localeCombo);
     headerLayout->addWidget(localeName);
 
-    QVBoxLayout *l = new QVBoxLayout(this);
+    QWidget *central = new QWidget;
+    QVBoxLayout *l = new QVBoxLayout(central);
     l->addWidget(w);
     l->addWidget(tabWidget);
 
@@ -96,6 +97,8 @@ Window::Window()
 
     localeCombo->setCurrentIndex(0);
     systemLocaleChanged();
+
+    setCentralWidget(central);
 }
 
 void Window::systemLocaleChanged()
@@ -129,5 +132,5 @@ bool Window::event(QEvent *event)
     default:
         break;
     }
-    return QWidget::event(event);
+    return QMainWindow::event(event);
 }
diff --git a/tests/manual/qlocale/window.h b/tests/manual/qlocale/window.h
index b75d3b22ab..dfef895e1a 100644
--- a/tests/manual/qlocale/window.h
+++ b/tests/manual/qlocale/window.h
@@ -50,7 +50,7 @@
 #include "numberformats.h"
 #include "miscellaneous.h"
 
-class Window : public QWidget
+class Window : public QMainWindow
 {
     Q_OBJECT
 public: