diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 09:38:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 09:38:20 (GMT) |
| commit | c2d213becf8f96257789ebeb3ab074733da36424 (patch) | |
| tree | 7c4e11190e1e0db4e05261d67d82138998c52477 /mkspecs | |
| parent | 76b8cc4f12e8211bb5bb26f44613ac1d2ffcb5e7 (diff) | |
| parent | 242220cccfeb9212f8425d04c2dda36e9d2c63c9 (diff) | |
| download | Qt-c2d213becf8f96257789ebeb3ab074733da36424.zip Qt-c2d213becf8f96257789ebeb3ab074733da36424.tar.gz Qt-c2d213becf8f96257789ebeb3ab074733da36424.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:
Enabling runfast mode when vfpv2 used.
Fixing a test case to be runnable on Symbian device.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 7162bad..6113746 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -148,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} + } + } +}
\ No newline at end of file |