summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-03-09 15:53:19 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-03-09 16:00:15 (GMT)
commit02f6da62a42bd1059eb0da091d1f46efbb919750 (patch)
tree94da8ffcb99f1d61e356a84f985dcb6dd5bb5e65 /mkspecs/symbian
parentfbe80a0094d7ef501f2308e70f19342f875dd94c (diff)
downloadQt-02f6da62a42bd1059eb0da091d1f46efbb919750.zip
Qt-02f6da62a42bd1059eb0da091d1f46efbb919750.tar.gz
Qt-02f6da62a42bd1059eb0da091d1f46efbb919750.tar.bz2
Use the same concept for per-lib tweaks as armcc
Now the compiler specific options in gui.pro and WebCore.pro are only for the mmp based build systems. Lets make that clear and mark them as such.
Diffstat (limited to 'mkspecs/symbian')
-rw-r--r--mkspecs/symbian/linux-armcc/qmake.conf24
1 files changed, 23 insertions, 1 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index f8c666a..750fb79 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -10,9 +10,31 @@ QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scp
QMAKE_RVCT_LINKSTYLE = 1
+# notice that the middle part of the following set of vars matches the TARGET content of the libs
+
+#QMAKE_qtmain_CXXFLAGS = --arm
+#QMAKE_QtCore_CXXFLAGS =
+QMAKE_QtGui_LFLAGS = "--rw-base 0x800000"
+#QMAKE_QtDBus_CXXFLAGS =
+#QMAKE_QtDeclarative_CXXFLAGS =
+#QMAKE_QtMultimedia_CXXFLAGS =
+#QMAKE_QtNetwork_CXXFLAGS =
+#QMAKE_QtOpenGL_CXXFLAGS =
+#QMAKE_QtOpenVG_CXXFLAGS =
+#QMAKE_phonon_CXXFLAGS =
+#QMAKE_QtScript_CXXFLAGS =
+#QMAKE_QtScriptTools_CXXFLAGS =
+#QMAKE_QtSql_CXXFLAGS =
+#QMAKE_QtSvg_CXXFLAGS =
+#QMAKE_QtTest_CXXFLAGS =
+#QMAKE_QtXmlPatterns_CXXFLAGS =
+#QMAKE_QtXml_CXXFLAGS =
+# Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
+QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000
+
QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_parse_templates $$QMAKE_CXXFLAGS.ARMCC
-QMAKE_LFLAGS += --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --rw-base 0x800000 --dll --no_scanlib
+QMAKE_LFLAGS += --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib
QMAKE_LFLAGS_APP += --entry _E32Startup
DEFINES += EKA2 \