1 files changed, 4 insertions, 43 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index a44cacfaef..bbe62fbaa4 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -75,13 +75,6 @@
 
 #include "../../shared/util.h"
 
-
-#ifdef Q_WS_S60
-#include <avkon.hrh>                // EEikStatusPaneUidTitle
-#include <akntitle.h>               // CAknTitlePane
-#include <akncontext.h>             // CAknContextPane
-#endif
-
 #ifdef Q_WS_QWS
 # include <qscreen_qws.h>
 #endif
@@ -1772,9 +1765,6 @@ void tst_QWidget::windowState()
         pos = QPoint(10,10);
         size = QSize(100,100);
     }
-#elif defined(Q_WS_S60)
-    QPoint pos = QPoint(10,10);
-    QSize size = QSize(100,100);
 #else
     const QPoint pos(500, 500);
     const QSize size(200, 200);
@@ -1915,7 +1905,7 @@ void tst_QWidget::showMaximized()
     layouted.showNormal();
     QVERIFY(!(layouted.windowState() & Qt::WindowMaximized));
 
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_S60) && !defined(Q_WS_QPA)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_QPA)
 //embedded may choose a different size to fit on the screen.
     QCOMPARE(layouted.size(), layouted.sizeHint());
 #endif
@@ -1992,7 +1982,7 @@ void tst_QWidget::showFullScreen()
     layouted.showNormal();
     QVERIFY(!(layouted.windowState() & Qt::WindowFullScreen));
 
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined (Q_WS_S60) && !defined(Q_WS_QPA)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_QPA)
 //embedded may choose a different size to fit on the screen.
     QCOMPARE(layouted.size(), layouted.sizeHint());
 #endif
@@ -3345,35 +3335,6 @@ QString textPropertyToString(Display *display, XTextProperty& text_prop)
     }
     return ret;
 }
-
-#endif
-
-#if defined(Q_WS_S60)
-// Returns the application's status pane control, if not present returns NULL.
-static CCoeControl* GetStatusPaneControl( TInt aPaneId )
-{
-    const TUid paneUid = { aPaneId };
-
-    CEikStatusPane* statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane();
-    if (statusPane && statusPane->PaneCapabilities(paneUid).IsPresent()){
-		CCoeControl* control = NULL;
-        // ControlL shouldn't leave because the pane is present
-		TRAPD(err, control = statusPane->ControlL(paneUid));
-		return err != KErrNone ? NULL : control;
-    }
-    return NULL;
-}
-// Returns the application's title pane, if not present returns NULL.
-static CAknTitlePane* TitlePane()
-{
-    return static_cast<CAknTitlePane*>(GetStatusPaneControl(EEikStatusPaneUidTitle));
-}
-
-// Returns the application's title pane, if not present returns NULL.
-static CAknContextPane* ContextPane()
-{
-    return static_cast<CAknContextPane*>(GetStatusPaneControl(EEikStatusPaneUidContext));
-}
 #endif
 
 void tst_QWidget::task110173()
@@ -7142,7 +7103,7 @@ void tst_QWidget::repaintWhenChildDeleted()
     }
 #endif
     ColorWidget w(0, Qt::red);
-#if !defined(Q_OS_WINCE) && !defined(Q_WS_S60)
+#if !defined(Q_OS_WINCE)
     QPoint startPoint = QApplication::desktop()->availableGeometry(&w).topLeft();
     startPoint.rx() += 50;
     startPoint.ry() += 50;
@@ -7174,7 +7135,7 @@ void tst_QWidget::repaintWhenChildDeleted()
 void tst_QWidget::hideOpaqueChildWhileHidden()
 {
     ColorWidget w(0, Qt::red);
-#if !defined(Q_OS_WINCE) && !defined(Q_WS_S60)
+#if !defined(Q_OS_WINCE)
     QPoint startPoint = QApplication::desktop()->availableGeometry(&w).topLeft();
     startPoint.rx() += 50;
     startPoint.ry() += 50;