remove symbian vestiges

Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

19 files changed, 7 insertions, 84 deletions

diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro
index ddf7ecb..db5fc71 100644
--- a/examples/script/calculator/calculator.pro
+++ b/examples/script/calculator/calculator.pro
@@ -11,7 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.js *.ui
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro
index d2bc25d..8be9a56 100644
--- a/examples/script/context2d/context2d.pro
+++ b/examples/script/context2d/context2d.pro
@@ -22,13 +22,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS context2d.pro scripts
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/context2d
 INSTALLS += target sources
 
-symbian:{
-    TARGET.UID3 = 0xA000C608
-    CONFIG += qt_example
-    TARGET.EPOCHEAPSIZE = 0x200000 0xA00000
-    contextScripts.path = .
-    contextScripts.files = scripts
-    DEPLOYMENT += contextScripts
-}
 maemo5: CONFIG += qt_example
 
diff --git a/examples/script/customclass/customclass.pro b/examples/script/customclass/customclass.pro
index 612456b..13dab7d 100644
--- a/examples/script/customclass/customclass.pro
+++ b/examples/script/customclass/customclass.pro
@@ -12,7 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.pri
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/customclass
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/defaultprototypes/defaultprototypes.pro b/examples/script/defaultprototypes/defaultprototypes.pro
index 0685673..4c5d1d3 100644
--- a/examples/script/defaultprototypes/defaultprototypes.pro
+++ b/examples/script/defaultprototypes/defaultprototypes.pro
@@ -9,5 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.js defaultprototypes.p
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/defaultprototypes
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
diff --git a/examples/script/helloscript/helloscript.pro b/examples/script/helloscript/helloscript.pro
index 419a826..5958afa 100644
--- a/examples/script/helloscript/helloscript.pro
+++ b/examples/script/helloscript/helloscript.pro
@@ -8,5 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloscript.pro helloscr
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/helloscript
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
diff --git a/examples/script/marshal/marshal.pro b/examples/script/marshal/marshal.pro
index 8519d9f..16da5af 100644
--- a/examples/script/marshal/marshal.pro
+++ b/examples/script/marshal/marshal.pro
@@ -8,7 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS marshal.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/qscript/qscript.pro b/examples/script/qscript/qscript.pro
index 4efe686..895e46c 100644
--- a/examples/script/qscript/qscript.pro
+++ b/examples/script/qscript/qscript.pro
@@ -13,7 +13,4 @@ sources.files = $$RESOURCES $$FORMS main.cpp qscript.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qscript
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/qsdbg/qsdbg.pro b/examples/script/qsdbg/qsdbg.pro
index 1e2a2c8..c9270c9 100644
--- a/examples/script/qsdbg/qsdbg.pro
+++ b/examples/script/qsdbg/qsdbg.pro
@@ -12,7 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qsdbg.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/qstetrix/qstetrix.pro b/examples/script/qstetrix/qstetrix.pro
index de02601..b978b48 100644
--- a/examples/script/qstetrix/qstetrix.pro
+++ b/examples/script/qstetrix/qstetrix.pro
@@ -14,7 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qstetrix.pro *.js
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
-
-symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/script/script.pro b/examples/script/script.pro
index 9e66a61..ef0ab01 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -5,8 +5,6 @@ SUBDIRS = customclass
 !wince*:!contains(QT_CONFIG, no-gui):SUBDIRS += qscript marshal
 !wince*:SUBDIRS *= marshal
 
-symbian: SUBDIRS = context2d
-
 isEmpty(QT.widgets.name):SUBDIRS -= \
     context2d \
     defaultprototypes \
@@ -19,5 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS script.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 maemo5: CONFIG += qt_example
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
index 7a3dcd2..0671e87 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
@@ -13,12 +13,6 @@ CONFIG(debug, debug|release) {
     OBJECTS_DIR = obj/release
 }
 
-symbian: {
-    # Need to guarantee this comes before system includes of /epoc32/include
-    MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler"
-    LIBS += -lhal
-}
-
 INCLUDEPATH = \
     $$PWD \
     $$PWD/.. \
diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri
index 9aaaa99..7eb83a8 100644
--- a/src/3rdparty/javascriptcore/WebKit.pri
+++ b/src/3rdparty/javascriptcore/WebKit.pri
@@ -40,10 +40,6 @@ building-libs {
                 else: LIBS += $${QTWEBKITLIBNAME}.lib
             } else {
                 LIBS += -lQtWebKit
-                symbian {
-                    TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB
-                    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB
-                }
             }
         }
     }
@@ -51,7 +47,7 @@ building-libs {
 }
 greaterThan(QT_MINOR_VERSION, 5):DEFINES += WTF_USE_ACCELERATED_COMPOSITING
 
-!mac:!unix|symbian {
+!mac:!unix {
     DEFINES += USE_SYSTEM_MALLOC
 }
 
@@ -66,7 +62,7 @@ CONFIG -= warn_on
 *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
 
 # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
-symbian|*-armcc {
+*-armcc {
     RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293
     RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates
 }
@@ -76,11 +72,7 @@ symbian|*-armcc {
     QMAKE_CXXFLAGS += $$RVCT_COMMON_CXXFLAGS
 }
 
-symbian {
-    QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS
-}
-
-symbian|maemo5: DEFINES *= QT_NO_UITOOLS
+maemo5: DEFINES *= QT_NO_UITOOLS
 
 contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
 
diff --git a/src/script/script.pro b/src/script/script.pro
index 7891513..03a9da1 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -71,20 +71,6 @@ INCLUDEPATH += $$PWD
 
 include(script.pri)
 
-symbian {
-    TARGET.UID3=0x2001B2E1
-}
-
-symbian {
-    symbian-abld|symbian-sbsv2 {
-        MMP_RULES += ALWAYS_BUILD_AS_ARM
-    }  else {
-        QMAKE_CFLAGS -= --thumb
-        QMAKE_CXXFLAGS -= --thumb
-    }
-    QMAKE_CXXFLAGS.ARMCC += -OTime -O3
-}
-
 integrity {
     CFLAGS += --diag_remark=236,82
 }
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index 555278f..0cb8381 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -8,5 +8,3 @@ DEFINES   += QT_NO_USING_NAMESPACE
 load(qt_module)
 
 include(debugging/debugging.pri)
-
-symbian:TARGET.UID3=0x2001E625
diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro
index adc1a46..3900f5d 100644
--- a/tests/auto/qscriptengine/qscriptengine.pro
+++ b/tests/auto/qscriptengine/qscriptengine.pro
@@ -7,18 +7,14 @@ include(../shared/util.pri)
 
 wince* {
     DEFINES += SRCDIR=\\\"./\\\"
-} else:!symbian {
+} else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
 
-wince*|symbian: {
+wince* {
    addFiles.files = script
    addFiles.path = .
    DEPLOYMENT += addFiles
 }
 
-symbian: {
-   TARGET.UID3 = 0xE0340006
-   DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
-}
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
index c449a8e..0acd167 100644
--- a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
+++ b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
@@ -5,9 +5,9 @@ SOURCES  += tst_qscriptjstestsuite.cpp
 RESOURCES += qscriptjstestsuite.qrc
 include(../qscriptv8testsuite/abstracttestsuite.pri)
 
-!symbian: DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-wince*|symbian: {
+wince* {
 testFiles.files = tests
 testFiles.path = .
 DEPLOYMENT += testFiles
diff --git a/tests/benchmarks/script/qscriptengine/qscriptengine.pro b/tests/benchmarks/script/qscriptengine/qscriptengine.pro
index c8e89da..cc95370 100644
--- a/tests/benchmarks/script/qscriptengine/qscriptengine.pro
+++ b/tests/benchmarks/script/qscriptengine/qscriptengine.pro
@@ -6,8 +6,4 @@ SOURCES += tst_qscriptengine.cpp
 
 QT += script testlib
 
-symbian* {
-    TARGET.EPOCHEAPSIZE  = 0x20000 0x2000000 // Min 128kB, Max 32MB
-    TARGET.EPOCSTACKSIZE = 0x14000
-}
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/script/sunspider/sunspider.pro b/tests/benchmarks/script/sunspider/sunspider.pro
index 5cc3682..f275fa7 100644
--- a/tests/benchmarks/script/sunspider/sunspider.pro
+++ b/tests/benchmarks/script/sunspider/sunspider.pro
@@ -6,8 +6,4 @@ SOURCES += tst_sunspider.cpp
 
 QT = core script testlib
 
-symbian* {
-    TARGET.EPOCHEAPSIZE  = 0x20000 0x2000000 // Min 128kB, Max 32MB
-    TARGET.EPOCSTACKSIZE = 0x14000
-}
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/script/v8/v8.pro b/tests/benchmarks/script/v8/v8.pro
index 136403f..59af163 100644
--- a/tests/benchmarks/script/v8/v8.pro
+++ b/tests/benchmarks/script/v8/v8.pro
@@ -6,8 +6,4 @@ SOURCES += tst_v8.cpp
 
 QT = core script testlib
 
-symbian* {
-    TARGET.EPOCHEAPSIZE  = 0x20000 0x2000000 // Min 128kB, Max 32MB
-    TARGET.EPOCSTACKSIZE = 0x14000
-}
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0