remove symbian vestiges

Change-Id: I2841caece488ac2df959a26a47d245756b4d06a5
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

13 files changed, 4 insertions, 115 deletions

diff --git a/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.pro b/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.pro
index e4ad857..4df8d80 100644
--- a/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.pro
+++ b/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.pro
@@ -14,8 +14,3 @@ CONFIG += mobility
 MOBILITY = feedback
 
 SOURCES += qtfeedbackdocsample.cpp
-
-symbian {
-    TARGET.EPOCALLOWDLLDATA = 1
-    MMP_RULES+="EXPORTUNFROZEN"
-}
diff --git a/examples/examples.pri b/examples/examples.pri
index c635d49..68819f3 100644
--- a/examples/examples.pri
+++ b/examples/examples.pri
@@ -1,24 +1,3 @@
-exists($$PWD/maemo5pkgrules.pri): exists($$PWD/symbianpkgrules.pri) {
-    symbian: include($$PWD/symbianpkgrules.pri)
-    maemo5: include($$PWD/maemo5pkgrules.pri)
-
-    maemo6 {
-        DEFINES+= Q_WS_MAEMO_6
-        DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
-        DEFINES+= QTM_EXAMPLES_PREFER_LANDSCAPE
-    }
-    maemo5 {
-        DEFINES+= Q_WS_MAEMO_5
-        DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
-        DEFINES+= QTM_EXAMPLES_PREFER_LANDSCAPE
-    }
-    symbian {
-        DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
-    }
-} else {
-    include(../features/basic_examples_setup.pri)
-}
-
 !plugin {
     target.path=$$QT_MOBILITY_EXAMPLES
 } else {
diff --git a/examples/hapticsplayer/hapticsplayer.pro b/examples/hapticsplayer/hapticsplayer.pro
index 481fef4..d77892b 100644
--- a/examples/hapticsplayer/hapticsplayer.pro
+++ b/examples/hapticsplayer/hapticsplayer.pro
@@ -15,7 +15,3 @@ FORMS += hapticsplayer.ui
 CONFIG = feedback
 
 include(../examples.pri)
-
-symbian: {
-    TARGET.CAPABILITY = WriteDeviceData ReadDeviceData
-}
diff --git a/examples/hapticsquare/hapticsquare.pro b/examples/hapticsquare/hapticsquare.pro
index df4481f..c303e6b 100644
--- a/examples/hapticsquare/hapticsquare.pro
+++ b/examples/hapticsquare/hapticsquare.pro
@@ -15,8 +15,4 @@ SOURCES += hapticsquare.cpp main.cpp \
 
 CONFIG = feedback
 
-symbian: {
-     TARGET.CAPABILITY = WriteDeviceData ReadDeviceData
-}
-
 include(../examples.pri)
diff --git a/src/plugins/feedback/immersion/immersion.pro b/src/plugins/feedback/immersion/immersion.pro
index fb5a204..eac187e 100644
--- a/src/plugins/feedback/immersion/immersion.pro
+++ b/src/plugins/feedback/immersion/immersion.pro
@@ -8,17 +8,3 @@ HEADERS += qfeedback.h
 SOURCES += qfeedback.cpp
 
 LIBS += -limmvibe
-
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    TARGET = $${TARGET}$${QT_LIBINFIX}
-    load(armcc_warnings)
-
-    target.path = /sys/bin
-    INSTALLS += target
-
-    symbianplugin.sources = $${TARGET}.dll
-    symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
-    DEPLOYMENT += symbianplugin
-}
diff --git a/src/plugins/feedback/mmk/mmk.pro b/src/plugins/feedback/mmk/mmk.pro
index eba7d40..ed08b40 100644
--- a/src/plugins/feedback/mmk/mmk.pro
+++ b/src/plugins/feedback/mmk/mmk.pro
@@ -6,18 +6,3 @@ load(qt_plugin)
 
 HEADERS += qfeedback.h
 SOURCES += qfeedback.cpp
-
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    TARGET.UID3 = 0x200315FF
-    TARGET = $${TARGET}$${QT_LIBINFIX}
-    load(armcc_warnings)
-
-    target.path = /sys/bin
-    INSTALLS += target
-
-    symbianplugin.sources = $${TARGET}.dll
-    symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
-    DEPLOYMENT += symbianplugin
-}
diff --git a/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro b/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro
index f436a70..1d215d5 100644
--- a/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro
+++ b/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro
@@ -4,13 +4,7 @@ QT += qml feedback network
 
 SOURCES += tst_qdeclarativefeedback.cpp
 
-symbian: {
-    importFiles.sources = data
-    importFiles.path = .
-    DEPLOYMENT += importFiles
-} else {
-    DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 OTHER_FILES += \
     data/hapticseffect.qml \
diff --git a/tests/auto/qfeedbackactuator/qfeedbackactuator.pro b/tests/auto/qfeedbackactuator/qfeedbackactuator.pro
index fe8c482..190fc10 100644
--- a/tests/auto/qfeedbackactuator/qfeedbackactuator.pro
+++ b/tests/auto/qfeedbackactuator/qfeedbackactuator.pro
@@ -4,5 +4,5 @@ QT += feedback
 
 SOURCES += tst_qfeedbackactuator.cpp
 
-symbian|linux-g++-maemo:DEFINES += HAVE_ACTUATORS
+linux-g++-maemo:DEFINES += HAVE_ACTUATORS
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qfeedbackmmk/qfeedbackmmk.pro b/tests/auto/qfeedbackmmk/qfeedbackmmk.pro
index a90f4a1..2c1c8de 100644
--- a/tests/auto/qfeedbackmmk/qfeedbackmmk.pro
+++ b/tests/auto/qfeedbackmmk/qfeedbackmmk.pro
@@ -4,7 +4,7 @@ QT += feedback
 
 SOURCES += tst_qfeedbackmmk.cpp
 
-wince*|symbian {
+wince* {
     deploy.files = test.wav
     DEPLOYMENT = deploy
     DEFINES += QT_QFEEDBACKMMK_USEAPPLICATIONPATH
diff --git a/tests/auto/qfeedbackplugin/testplugin/testplugin.pro b/tests/auto/qfeedbackplugin/testplugin/testplugin.pro
index eb2680a..774a82a 100644
--- a/tests/auto/qfeedbackplugin/testplugin/testplugin.pro
+++ b/tests/auto/qfeedbackplugin/testplugin/testplugin.pro
@@ -7,18 +7,4 @@ load(qt_plugin)
 HEADERS += qfeedbacktestplugin.h
 SOURCES += qfeedbacktestplugin.cpp
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    TARGET = $${TARGET}$${QT_LIBINFIX}
-    load(armcc_warnings)
-
-    target.path = /sys/bin
-    INSTALLS += target
-
-    symbianplugin.sources = $${TARGET}.dll
-    symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
-    DEPLOYMENT += symbianplugin
-}
-
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro b/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro
index ee0c2be..4097137 100644
--- a/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro
+++ b/tests/auto/qfeedbackplugin/testplugin2/testplugin2.pro
@@ -9,18 +9,4 @@ CONFIG += testplugin
 HEADERS += qfeedbacktestplugin.h
 SOURCES += qfeedbacktestplugin.cpp
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    TARGET = $${TARGET}$${QT_LIBINFIX}
-    load(armcc_warnings)
-
-    target.path = /sys/bin
-    INSTALLS += target
-
-    symbianplugin.sources = $${TARGET}.dll
-    symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
-    DEPLOYMENT += symbianplugin
-}
-
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro b/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro
index c7a97e6..63b9dd7 100644
--- a/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro
+++ b/tests/auto/qfeedbackplugin/testplugin3/testplugin3.pro
@@ -11,18 +11,4 @@ CONFIG += testplugin
 HEADERS += qfeedbacktestplugin.h
 SOURCES += qfeedbacktestplugin.cpp
 
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    TARGET = $${TARGET}$${QT_LIBINFIX}
-    load(armcc_warnings)
-
-    target.path = /sys/bin
-    INSTALLS += target
-
-    symbianplugin.sources = $${TARGET}.dll
-    symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
-    DEPLOYMENT += symbianplugin
-}
-
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qfeedbackplugin/unittest/unittest.pro b/tests/auto/qfeedbackplugin/unittest/unittest.pro
index 20b7e17..15207b9 100644
--- a/tests/auto/qfeedbackplugin/unittest/unittest.pro
+++ b/tests/auto/qfeedbackplugin/unittest/unittest.pro
@@ -4,5 +4,5 @@ QT += feedback
 
 SOURCES += tst_qfeedbackplugin.cpp
 
-symbian|linux-g++-maemo:DEFINES += HAVE_ACTUATORS
+linux-g++-maemo:DEFINES += HAVE_ACTUATORS
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0