diff options
author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-17 16:25:47 (GMT) |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-17 16:38:09 (GMT) |
commit | 36c8b46571617b5ed098a111da6a34cc7092247b (patch) | |
tree | 9690653f797a2dee1fba0b762a81be142ed23f03 | |
parent | 5962bd47ba62744f847872f14bfc9f0b09b4a7e6 (diff) | |
download | Qt-36c8b46571617b5ed098a111da6a34cc7092247b.zip Qt-36c8b46571617b5ed098a111da6a34cc7092247b.tar.gz Qt-36c8b46571617b5ed098a111da6a34cc7092247b.tar.bz2 |
Fixed the qlocale manual test app on symbian.
Reviewed-by: trustme
-rw-r--r-- | tests/manual/qlocale/main.cpp | 4 | ||||
-rw-r--r-- | tests/manual/qlocale/window.cpp | 7 | ||||
-rw-r--r-- | tests/manual/qlocale/window.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tests/manual/qlocale/main.cpp b/tests/manual/qlocale/main.cpp index b14a44f..c85bd19 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 fae88a3..89e3ec6 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 b75d3b2..dfef895 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: |