diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-04-01 08:45:34 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-04-01 08:45:34 (GMT) |
| commit | 603ee8b841385c04c5118650075134154aee29a7 (patch) | |
| tree | 690a0b4abfa9a20551aab285cbb0fef49686c917 /tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | |
| parent | d5e6111c62bc4437243fb1d6389e3af180f623d7 (diff) | |
| parent | 8ffd45cf6832b67960dbaa10654c4b84358fe3f9 (diff) | |
| download | Qt-603ee8b841385c04c5118650075134154aee29a7.zip Qt-603ee8b841385c04c5118650075134154aee29a7.tar.gz Qt-603ee8b841385c04c5118650075134154aee29a7.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/gui/text/qstatictext.cpp
Diffstat (limited to 'tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp')
| -rw-r--r-- | tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index a3dfd6c..5f9a578 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -255,10 +255,6 @@ tst_Suite::tst_Suite() addTestExclusion("string-case", "V8-specific behavior? (Doesn't pass on SpiderMonkey either)"); -#ifdef Q_CC_MINGW - addTestExclusion("date$", "QTBUG-7698: Date.prototype.setMonth() crashes on win32-g++"); -#endif - #ifdef Q_OS_WINCE addTestExclusion("deep-recursion", "Demands too much memory on WinCE"); addTestExclusion("nested-repetition-count-overflow", "Demands too much memory on WinCE"); |