summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-26 04:04:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-26 04:04:12 (GMT)
commit3a2be8081b887e63810c332bb820d74b75282b48 (patch)
tree5a112d5e25e449d04ca982e39ff1f8f6bbd1fc8a
parentac6c9dc0ee0ce53c0aca479f794902e8062a0a4b (diff)
parent095c0e901cf4ddd91842e902e89fdc19e69b9a8c (diff)
downloadQt-3a2be8081b887e63810c332bb820d74b75282b48.zip
Qt-3a2be8081b887e63810c332bb820d74b75282b48.tar.gz
Qt-3a2be8081b887e63810c332bb820d74b75282b48.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Speed up compilation of this test with MSVC.
-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
+}