diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-03 21:45:04 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-04 12:44:15 +0100 |
commit | 2f1eac5f35466ee257eb5d4a61aa3a837d53b82a (patch) | |
tree | 39e8b6bfffc5744b88d5e55f3f18cb7d064072ed /src/3rdparty | |
parent | 7c8debaf726d26d68c940abdc5538f550accba0b (diff) | |
download | qtscript-2f1eac5f35466ee257eb5d4a61aa3a837d53b82a.tar.gz |
remove symbian vestiges
Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 6 | ||||
-rw-r--r-- | src/3rdparty/javascriptcore/WebKit.pri | 14 |
2 files changed, 3 insertions, 17 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 |