From e83d3937a236dc4a339c50a8f287e1a341f3b47f Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Mon, 8 Feb 2010 10:26:37 +0100 Subject: Fixing a test case to be runnable on Symbian device. Number of stacked items had to be lowered due to memory constrains. Reviewed-by: TrustMe --- tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp index d98a2a1..4cb07db 100644 --- a/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/qgraphicsview/tst_qgraphicsview.cpp @@ -171,7 +171,7 @@ void tst_QGraphicsView::paintSingleItem() } #ifdef Q_OS_SYMBIAN -# define DEEP_STACKING_COUNT 200 +# define DEEP_STACKING_COUNT 85 #else # define DEEP_STACKING_COUNT 1000 #endif -- cgit v0.12 From 242220cccfeb9212f8425d04c2dda36e9d2c63c9 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Mon, 8 Feb 2010 10:31:04 +0100 Subject: Enabling runfast mode when vfpv2 used. The fpu flag is monitored and when either 'softvfp+vfpv2' or 'vfpv2' detected we are turning on RunFast mode (via --fpumode fast switch). Reviewed-by: Iain --- mkspecs/common/symbian/symbian.conf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 -- cgit v0.12