diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-29 08:13:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-29 08:13:40 +0200 |
| commit | cc74452d6d259d36ac47c536f11a5efb269e8e44 (patch) | |
| tree | e43ac89e9edde354d12fbddffcbb6e40108cc643 /tests/auto/gui | |
| parent | 6cbd982836266a59e926d8f149ad0013bd8162a3 (diff) | |
| parent | e52fcb7dc78c83586c813f55f087a98bae4eaa0e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
configure
src/plugins/platforms/winrt/qwinrtclipboard.cpp
Change-Id: Ic6d58be3d1ed2bb507f2ba06c82361afd9f9ddb9
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index 1869139a98..b2b2f25615 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -314,6 +314,8 @@ void tst_QTextDocument::find_data() << 15 << 6 << 11; QTest::newRow("nbsp") << "Hello" + QString(QChar(QChar::Nbsp)) +"World" << " " << int(QTextDocument::FindCaseSensitively) << 0 << 5 << 6; + + QTest::newRow("from-the-end") << "Hello World" << "Hello World" << int(QTextDocument::FindCaseSensitively| QTextDocument::FindBackward) << 11 << 0 << 11; } void tst_QTextDocument::find() |