summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-armcc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-04-07 11:53:44 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-04-07 11:53:44 (GMT)
commit2eae397d7c4e549f7c77f0bc7e22f0d9390c7ec3 (patch)
treef41094475f8c9b8ace89bacdc6080a47c542f6e1 /mkspecs/symbian-armcc
parent99eb6c6c2048ce4d96348c54a79986c779fdf656 (diff)
downloadQt-2eae397d7c4e549f7c77f0bc7e22f0d9390c7ec3.zip
Qt-2eae397d7c4e549f7c77f0bc7e22f0d9390c7ec3.tar.gz
Qt-2eae397d7c4e549f7c77f0bc7e22f0d9390c7ec3.tar.bz2
Correct some parameters for the makefile build sytem, armcc and gcce
Reviewed-by: axis
Diffstat (limited to 'mkspecs/symbian-armcc')
-rw-r--r--mkspecs/symbian-armcc/qmake.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/symbian-armcc/qmake.conf b/mkspecs/symbian-armcc/qmake.conf
index 77a1966..2de3218 100644
--- a/mkspecs/symbian-armcc/qmake.conf
+++ b/mkspecs/symbian-armcc/qmake.conf
@@ -12,7 +12,7 @@ QMAKE_RVCT_LINKSTYLE = 1
#QMAKE_qtmain_CXXFLAGS = --arm
#QMAKE_QtCore_CXXFLAGS =
-QMAKE_QtGui_LFLAGS = "--rw-base 0x800000"
+#QMAKE_QtGui_LFLAGS = "--rw-base 0x800000"
#QMAKE_QtDBus_CXXFLAGS =
#QMAKE_QtDeclarative_CXXFLAGS =
#QMAKE_QtMultimedia_CXXFLAGS =
@@ -27,9 +27,9 @@ QMAKE_QtGui_LFLAGS = "--rw-base 0x800000"
#QMAKE_QtTest_CXXFLAGS =
#QMAKE_QtXmlPatterns_CXXFLAGS =
#QMAKE_QtXml_CXXFLAGS =
-QMAKE_QtWebKit_CXXFLAGS = --arm
+#QMAKE_QtWebKit_CXXFLAGS = --arm
# Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
-QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000
+#QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000
QMAKE_CFLAGS += --dllimport_runtime --diag_suppress 186,611,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS