diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-12 12:26:19 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-12 12:26:19 (GMT) |
| commit | 3d968f8bb2abd378eea8c056da5cb7e90f2f05ed (patch) | |
| tree | 1d9dae690df997a1be6b676a865ce268800d973c /tests | |
| parent | ec7459fa77cfa4a6fc7e4fca14339a14ea27d83c (diff) | |
| parent | db849a123ee639a4a63aabd83a450b05542f917f (diff) | |
| download | Qt-3d968f8bb2abd378eea8c056da5cb7e90f2f05ed.zip Qt-3d968f8bb2abd378eea8c056da5cb7e90f2f05ed.tar.gz Qt-3d968f8bb2abd378eea8c056da5cb7e90f2f05ed.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index 41df98c..10ff488 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -688,7 +688,7 @@ tst_Suite::tst_Suite() addExpectedFailure("ecma/TypeConversion/9.3.1-3.js", "- -\"0x80000000\"", willFixInNextReleaseMessage); #endif -#ifdef Q_OS_WIN +#ifdef Q_CC_MSVC addExpectedFailure("ecma_3/Expressions/11.7.3-01.js", "11.7.3 - >>> should evaluate operands in order: order", "QTBUG-8056"); addExpectedFailure("ecma_3/Operators/order-01.js", "operator evaluation order: 11.7.3 >>>", "QTBUG-8056"); addExpectedFailure("ecma_3/Operators/order-01.js", "operator evaluation order: 11.13.2 >>>=", "QTBUG-8056"); |