diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 09:55:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 09:55:14 (GMT) |
| commit | aae3b2686a7e232fd10bcb59880f31da7707c608 (patch) | |
| tree | b9b6652d4e30e3e226b9195d0f7b68ce20f435b7 /mkspecs/common | |
| parent | 57d33781bd8e02904a85de7fc54f8f4e8bd299e6 (diff) | |
| parent | 7b7f13d7ee1d5f93ee63a635c875accce918896a (diff) | |
| download | Qt-aae3b2686a7e232fd10bcb59880f31da7707c608.zip Qt-aae3b2686a7e232fd10bcb59880f31da7707c608.tar.gz Qt-aae3b2686a7e232fd10bcb59880f31da7707c608.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed def files on Symbian.
Added some missing documentation.
Fixed text rendering via scaled QPainter on rasterPaintEngine / Symbian
Documented limitations of add/setLibraryPath(s) on Symbian OS
Deployed QtMultimedia.dll on Symbian
Fixed the URL of known issues wiki page in docs
Fixing benchmark to be runnable on Symbian device
Fixing test to be runnable on Symbian devices.
Fixed no-timeout case for QProcess::waitForFinished in Symbian
Add visibility-inlines-hidden for GCCE on Symbian OS
Catch by reference rather than by value
Fixing benchmark for Symbian
Remove warning about Symbian DEF files when running configure for Windows
List item margins are too small due to invalid pixel metric value
Remove left over forward declarations
Avoided the loss of preedit text when losing focus on Symbian.
Added support for ifdeffing for manufacturer in generated pkg files
Shortening and fixing previous fix for QTBUG-6371
Update default FPU flags on Symbian to be softvfp+vfpv2
Using RunFast mode for RVCT
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index a2933e9..8760603 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -30,6 +30,7 @@ QMAKE_CXX = g++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS.CW = QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden +QMAKE_CXXFLAGS.GCCE = -fvisibility-inlines-hidden QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF @@ -147,3 +148,19 @@ exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/Series60v5.0.sis MMP_RULES -= PAGED } } + +QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast +# [TODO] QMAKE_CXXFLAGS_FAST_VFP.GCCE = + +symbian { + armfpu = $$find(MMP_RULES, "ARMFPU") + !isEmpty(armfpu) { + vfpv2 = $$find(MMP_RULES, "vfpv2") + !isEmpty(vfpv2) { + # we will respect fpu setting obtained from configure, but, + # if vfpv2 or softvfp+vfpv2 used we want to force RunFast VFP mode + QMAKE_CXXFLAGS.ARMCC += $${QMAKE_CXXFLAGS_FAST_VFP.ARMCC} + # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE} + } + } +} |