Leander Beernaert
|
502d3d6744
|
Merge remote-tracking branch 'origin/dev' into merge-dev
Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739
|
2020-01-24 13:17:33 +01:00 |
|
Friedemann Kleint
|
d556d7a6b8
|
Avoid initializing QFlags with 0 or nullptr in tests
Amends qtbase/af2daafde72db02454d24b7d691aa6861525ab99.
Change-Id: Ib5d17611e43e7ab2c63c7f0587f549377f262e32
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
2019-11-26 09:08:51 +01:00 |
|
Alexandru Croitor
|
7adcdcbf80
|
Regenerate tests/auto/corelib/text
Change-Id: I34e24b7c2697bcdddc628855e2b539b8db1b98b0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
|
2019-11-12 17:26:05 +00:00 |
|
Alexandru Croitor
|
c7ec7cd2a1
|
Merge branch 'wip/qt6' into wip/cmake
Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b
|
2019-08-15 16:53:19 +02:00 |
|
Edward Welbourne
|
a9aa206b7b
|
Move text-related code out of corelib/tools/ to corelib/text/
This includes byte array, string, char, unicode, locale, collation and
regular expressions.
Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
2019-07-10 17:05:30 +02:00 |
|