summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-26 05:44:28 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-26 05:44:28 (GMT)
commitae13ad51dda7246e73d282165201f637d04a667e (patch)
treebc5f379a8f16bb9180179057d2651996f9e616ff /tests
parent22c2f6cfca945e9c377e509b7ff2252f55599b27 (diff)
parent2931f07dbf824b7d11474bc040e08fcc8c01a166 (diff)
downloadQt-ae13ad51dda7246e73d282165201f637d04a667e.zip
Qt-ae13ad51dda7246e73d282165201f637d04a667e.tar.gz
Qt-ae13ad51dda7246e73d282165201f637d04a667e.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: Speed up compilation of this test with MSVC. Fix Symbian build when building for WINSCW with abld. Fix file descriptor leak with generic engine on Linux.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qscriptvalue/qscriptvalue.pro7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qscriptvalue/qscriptvalue.pro b/tests/auto/qscriptvalue/qscriptvalue.pro
index 1588cc5..191cd4a 100644
--- a/tests/auto/qscriptvalue/qscriptvalue.pro
+++ b/tests/auto/qscriptvalue/qscriptvalue.pro
@@ -5,3 +5,10 @@ HEADERS += tst_qscriptvalue.h
# Generated by testgen
SOURCES += tst_qscriptvalue_generated.cpp
+
+
+win32-msvc* {
+ # With -O2, MSVC takes up to 24 minutes to compile this test!
+ QMAKE_CXXFLAGS_RELEASE -= -O1 -O2
+ QMAKE_CXXFLAGS_RELEASE += -Od
+}