diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /tests/auto/corelib/text/qtextboundaryfinder/data/ReadMe.full.txt | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'tests/auto/corelib/text/qtextboundaryfinder/data/ReadMe.full.txt')
| -rw-r--r-- | tests/auto/corelib/text/qtextboundaryfinder/data/ReadMe.full.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/text/qtextboundaryfinder/data/ReadMe.full.txt b/tests/auto/corelib/text/qtextboundaryfinder/data/ReadMe.full.txt index 2e7eece864..bf370ad9be 100644 --- a/tests/auto/corelib/text/qtextboundaryfinder/data/ReadMe.full.txt +++ b/tests/auto/corelib/text/qtextboundaryfinder/data/ReadMe.full.txt @@ -1,4 +1,4 @@ -Temporary kludge at UCD Revision 24 until code can be fixed up. +Temporary kludge at UCD Revision 24--26 until code can be fixed up. -57 of the tests defined by the UCD data are here commented out. +57+53 of the tests defined by the UCD data are here commented out. The raw upstream files are provided as *.txt.full where this was needed. |