purge symbian vestiges

Change-Id: I34c07f4750e1053c37dc725343629bc3d0486013
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

8 files changed, 3 insertions, 47 deletions

diff --git a/examples/hapticsplayer/hapticsplayer.cpp b/examples/hapticsplayer/hapticsplayer.cpp
index 821541b..29cc5f6 100644
--- a/examples/hapticsplayer/hapticsplayer.cpp
+++ b/examples/hapticsplayer/hapticsplayer.cpp
@@ -114,14 +114,6 @@ HapticsPlayer::HapticsPlayer() : actuator(0)
 
     ui.tabWidget->setTabEnabled(1, QFeedbackEffect::supportsThemeEffect());
     ui.tabWidget->setTabEnabled(2, !QFeedbackFileEffect::supportedMimeTypes().isEmpty());
-#ifdef Q_OS_SYMBIAN
-    // Due to focus handling problems when using tabwidget in Qt/s60 with old non-touch-screen devices
-    // we have to handle focus explicitly here, this might get fixed at some point
-    connect(ui.tabWidget,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int)));
-    // force initial focus to a button on the first tab
-    ui.tabWidget->setCurrentIndex(0);
-    ui.playPause->setFocus();
-#endif
     //that is a hackish way of updating the info concerning the effects
     startTimer(50);
 }
@@ -148,23 +140,6 @@ void HapticsPlayer::actuatorChanged()
     }
 }
 
-#ifdef Q_OS_SYMBIAN
-void HapticsPlayer::tabChanged(int index)
-{
-    switch (index) {
-        case 0:
-           ui.playPause->setFocus();
-           break;
-        case 1:
-           ui.instantPlay->setFocus();
-           break;
-        case 2:
-           ui.browse->setFocus();
-           break;
-    }
-}
-#endif
-
 void HapticsPlayer::enabledChanged(bool on)
 {
     if (!on)
@@ -189,9 +164,6 @@ void HapticsPlayer::enabledChanged(bool on)
             ui.grpPeriod->hide();
         }
     }
-#ifdef Q_OS_SYMBIAN
-    ui.playPause->setFocus();
-#endif
 }
 
 void HapticsPlayer::playPauseClicked()
diff --git a/examples/hapticsplayer/hapticsplayer.h b/examples/hapticsplayer/hapticsplayer.h
index 57d6b69..3651918 100644
--- a/examples/hapticsplayer/hapticsplayer.h
+++ b/examples/hapticsplayer/hapticsplayer.h
@@ -74,9 +74,6 @@ private Q_SLOTS:
     void browseClicked();
     void filePlayPauseClicked();
 
-#ifdef Q_OS_SYMBIAN
-    void tabChanged(int index);
-#endif
 protected:
     void timerEvent(QTimerEvent *);
 
diff --git a/examples/hapticsplayer/main.cpp b/examples/hapticsplayer/main.cpp
index 2a6ce13..00bcbb1 100644
--- a/examples/hapticsplayer/main.cpp
+++ b/examples/hapticsplayer/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 
     HapticsPlayer w;
 
-#if defined Q_OS_SYMBIAN || defined (Q_OS_WINCE)
+#if defined(Q_OS_WINCE)
     w.showMaximized();
 #endif
     w.show();
diff --git a/examples/hapticsquare/main.cpp b/examples/hapticsquare/main.cpp
index 7ef645c..bd1490d 100644
--- a/examples/hapticsquare/main.cpp
+++ b/examples/hapticsquare/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.addLibraryPath("../../plugins"); // allows the plugins to be loaded
     HapticSquare w;
-#if defined Q_OS_SYMBIAN || defined (Q_OS_WINCE)
+#if defined (Q_OS_WINCE)
     w.setWindowState(Qt::WindowMaximized);
 #endif
     w.show();
diff --git a/tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp b/tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp
index 4acafd1..7af28dd 100644
--- a/tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp
+++ b/tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp
@@ -33,11 +33,6 @@
 #include <qfeedbackactuator.h>
 #include <QSignalSpy>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 Q_DECLARE_METATYPE(QFeedbackEffect::Effect);
 
 class tst_qdeclarativefeedback : public QObject
diff --git a/tests/auto/qfeedbackactuator/tst_qfeedbackactuator.cpp b/tests/auto/qfeedbackactuator/tst_qfeedbackactuator.cpp
index a98d2f1..819a25c 100644
--- a/tests/auto/qfeedbackactuator/tst_qfeedbackactuator.cpp
+++ b/tests/auto/qfeedbackactuator/tst_qfeedbackactuator.cpp
@@ -79,7 +79,7 @@ void tst_QFeedbackActuator::cleanup()
 }
 
 
-#if defined(HAVE_ACTUATORS) && !defined(Q_OS_SYMBIAN)
+#if defined(HAVE_ACTUATORS)
 //we're on meego/maemo
 #define CAPABILITY true //the capabilities are supported through Immersion
 #else
diff --git a/tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp b/tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp
index 26fd4fb..0ba10f5 100644
--- a/tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp
+++ b/tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp
@@ -75,10 +75,6 @@ void tst_QFeedbackHapticsEffect::cleanupTestCase()
 
 void tst_QFeedbackHapticsEffect::init()
 {
-#ifdef Q_OS_SYMBIAN
-    //we need that head start for the eventloop to be responsive
-    QTest::qWait(1000);
-#endif
 }
 
 void tst_QFeedbackHapticsEffect::cleanup()
diff --git a/tests/auto/qfeedbackmmk/tst_qfeedbackmmk.cpp b/tests/auto/qfeedbackmmk/tst_qfeedbackmmk.cpp
index 0e270cd..4d1bacb 100644
--- a/tests/auto/qfeedbackmmk/tst_qfeedbackmmk.cpp
+++ b/tests/auto/qfeedbackmmk/tst_qfeedbackmmk.cpp
@@ -87,10 +87,6 @@ void tst_QFeedbackMMK::cleanupTestCase()
 
 void tst_QFeedbackMMK::init()
 {
-#ifdef Q_OS_SYMBIAN
-    //we need that head start for the eventloop to be responsive
-    QTest::qWait(1000);
-#endif
 }
 
 void tst_QFeedbackMMK::cleanup()