diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 14:07:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 14:07:35 (GMT) |
| commit | f8c6df878f14e1b00a2dde03decffb6cba2f1687 (patch) | |
| tree | dce06dd46f02986d2a8697765633db07fe4f7b56 /tests/auto/qstring | |
| parent | 1a7a1172d048108c30a9890ce9477686711ad756 (diff) | |
| parent | 74d586cb6d5391b186bfa8211fbb1e33f7c20e2f (diff) | |
| download | Qt-f8c6df878f14e1b00a2dde03decffb6cba2f1687.zip Qt-f8c6df878f14e1b00a2dde03decffb6cba2f1687.tar.gz Qt-f8c6df878f14e1b00a2dde03decffb6cba2f1687.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits)
Give the toplevel widget a layout
fix tests when using Qt in a namespace
Fix tst_symbols auto test
trivial: fix build
Fix crash
fix isLikelyToBeNfs usage
Export isLikelyToBeNfs only if we have an internal build
Fixed QGraphicsView autotest to use a dummy toplevel widget
Fixed QMdiArea autotest to use a dummy toplevel widget.
Fixed QMenuBar autotest. Changed window activation order.
Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
Fixed QPathCliper autotest, to skip a test when qreal != double
Fixed QComboBox autotest to use a dummy toplevel widget
Fixed QColumnView autotest. Added an QApplication::processEvents
Fixed QAccessability autotest to use a dummy toplevel widget
Fix QListWidget test
Fix QGraphicsItems autotest
Fixed QGraphicsScene autotest to use a dummy toplevel widget
Fixed QGraphicsItem autotest to use a dummy toplevel widget
Fixed QListView autotest to use a dummy toplevel widget
...
Diffstat (limited to 'tests/auto/qstring')
| -rw-r--r-- | tests/auto/qstring/tst_qstring.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index 9df2a4d..16cf872 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -4433,8 +4433,10 @@ void tst_QString::nanAndInf() CHECK_NAN("nan ", true, true) CHECK_NAN("\t NAN", true, true) CHECK_NAN("\t NAN ", true, true) +#ifndef QT_QLOCALE_USES_FCVT //In case we use glibc this tests will fail CHECK_NAN("-nan", false, false) CHECK_NAN("+NAN", false, false) +#endif CHECK_NAN("NaN", true, true) CHECK_NAN("nAn", true, true) CHECK_NAN("NANe-10", false, false) |