summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/symbian
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-25 10:21:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-25 10:21:02 (GMT)
commit8bac7ecb2b7bfc1d1941749eaba4303d816281b4 (patch)
treee43ac65da5e444bc58e23e014bea5dba342520fd /mkspecs/common/symbian
parentd8f757bdb881c3a3d723642734d7d76fae14dce7 (diff)
parent6887d006ecf2b4a4250659c45a2d9ba002dbcb80 (diff)
downloadQt-8bac7ecb2b7bfc1d1941749eaba4303d816281b4.zip
Qt-8bac7ecb2b7bfc1d1941749eaba4303d816281b4.tar.gz
Qt-8bac7ecb2b7bfc1d1941749eaba4303d816281b4.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (29 commits) Update EABI and WINSCW DEF files for Symbian Fix linking on arm with def files Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595ab62b7c5f703a286c4f5f13f8784a936 Fixed incorrect parsing of TARGET.EPOCHEAPSIZE. Fixed make runonphone that looked for the package in the wrong place. Fixed several problems with the postlinker for Symbian (elf2e32). Don't crash when cleaning the uninitialized fontdatabase (Symbian) Revert "Fixing the race condition in event dispatcher implementation on" Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path" Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Fixed memory restrictions not being passed on to elf2e32. Allow TLW translucency on Symbian without Qt::FramelessWindowHint Updated UIDs for spectrum demo Ensure that compiling with the no debug/warning output defines works Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 Clean up HB_Anchor's DeviceTables on failure when loading format 3 Make sure ValueRecord's DeviceTables are cleaned up on failure Phonon(qt7); Don't try and display video frames when audio only. Audio(osx); Fix period size calculation. ...
Diffstat (limited to 'mkspecs/common/symbian')
-rw-r--r--mkspecs/common/symbian/symbian-makefile.conf2
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index ab0c5b9..b1ca367 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -14,8 +14,6 @@ QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
QMAKE_ELF2E32_FLAGS = --dlldata \
- --heap=0x00020000,0x00800000 \
- --stack=0x00014000 \
--fpu=softvfp \
--unfrozen \
--compressionmethod bytepair \