summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-23 21:30:23 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-23 21:30:23 (GMT)
commitf59947c44be1601a0d2a451c18693802533075d7 (patch)
treebcf08d01b02b542b99d8e24a9cb88f545794cf0e /tests
parentbab066cd455ef424ec75753273b1e0d4f3aae710 (diff)
parent5cc417be7eb5e43180f92ea2cc46cbf4c4d7395a (diff)
downloadQt-f59947c44be1601a0d2a451c18693802533075d7.zip
Qt-f59947c44be1601a0d2a451c18693802533075d7.tar.gz
Qt-f59947c44be1601a0d2a451c18693802533075d7.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QLineEdit shows leftovers of edit cursor after clear() doc: Added indication of default modality value for panels. doc: Added QScopedArrayPointer and corrected QScopedPointer snippet. Improve test coverage of QScriptString::toArrayIndex() QColorDialog::open() freezes the app the *second* time it is used on Mac doc: Corrected typo. doc: Removed bad grammar. doc: Added \obsolete. doc: Added \since 4.6 to the properties. doc: Removed some erroneous text.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qscriptstring/tst_qscriptstring.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qscriptstring/tst_qscriptstring.cpp b/tests/auto/qscriptstring/tst_qscriptstring.cpp
index 808b643..ea4a92b 100644
--- a/tests/auto/qscriptstring/tst_qscriptstring.cpp
+++ b/tests/auto/qscriptstring/tst_qscriptstring.cpp
@@ -177,6 +177,12 @@ void tst_QScriptString::toArrayIndex_data()
QTest::newRow("101a") << QString::fromLatin1("101a") << false << quint32(0xffffffff);
QTest::newRow("4294967294") << QString::fromLatin1("4294967294") << true << quint32(0xfffffffe);
QTest::newRow("4294967295") << QString::fromLatin1("4294967295") << false << quint32(0xffffffff);
+ QTest::newRow("0.0") << QString::fromLatin1("0.0") << false << quint32(0xffffffff);
+ QTest::newRow("1.0") << QString::fromLatin1("1.0") << false << quint32(0xffffffff);
+ QTest::newRow("1.5") << QString::fromLatin1("1.5") << false << quint32(0xffffffff);
+ QTest::newRow("1.") << QString::fromLatin1("1.") << false << quint32(0xffffffff);
+ QTest::newRow(".1") << QString::fromLatin1(".1") << false << quint32(0xffffffff);
+ QTest::newRow("1e0") << QString::fromLatin1("1e0") << false << quint32(0xffffffff);
}
void tst_QScriptString::toArrayIndex()