From c6ad1b0e1d930ab5e4d1835ae87524340541f2ee Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 4 Oct 2011 14:48:26 +1000
Subject: Remove last remnants of Maemo 5 from autotests

Change-Id: I69bc9a3fc5ec4f7f9b927919ca7627a8a1e61700
Reviewed-on: http://codereview.qt-project.org/5951
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 .../functional/GraphicsViewBenchmark/main.cpp      | 28 +++++++---------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'tests/benchmarks/gui/graphicsview/functional')

diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp
index 316dadd01b..e8019a946a 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp
@@ -321,17 +321,11 @@ void tst_GraphicsViewBenchmark::initTestCase()
     if (mSettings->size().width() > 0 && mSettings->size().height() > 0) {
         mMainView->resize(mSettings->size().width(), mSettings->size().height());
         mMainView->show();
-    } else {
-#if defined(Q_WS_MAEMO_5)
+    } else if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
         mMainView->showFullScreen();
-#else
-        if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
-            mMainView->showFullScreen();
-        } else {
-            mMainView->resize(360, 640);
-            mMainView->show();
-        }
-#endif
+    } else {
+        mMainView->resize(360, 640);
+        mMainView->show();
     }
 
     mDataGenerator.Reset();
@@ -779,17 +773,11 @@ int main(int argc, char *argv[])
         if (settings.size().width() > 0 && settings.size().height() > 0) {
             view.resize(settings.size().width(), settings.size().height());
             view.show();
-        } else {
-#if defined(Q_WS_MAEMO_5)
+        } else if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
             view.showFullScreen();
-#else
-            if (QApplication::desktop()->width() < 360 || QApplication::desktop()->height() < 640) {
-                view.showFullScreen();
-            } else {
-                view.resize(360, 640);
-                view.show();
-            }
-#endif
+        } else {
+            view.resize(360, 640);
+            view.show();
         }
         returnValue = app.exec();
     } else {
-- 
cgit v1.2.3