summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri6
-rw-r--r--src/3rdparty/javascriptcore/WebKit.pri14
-rw-r--r--src/script/script.pro14
-rw-r--r--src/scripttools/scripttools.pro2
4 files changed, 3 insertions, 33 deletions
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