Liang Qi b9585277e7 Merge remote-tracking branch 'origin/5.14' into 5.15 ... Conflicts: src/corelib/tools/qlinkedlist.h src/plugins/platforms/wasm/qwasmintegration.cpp src/plugins/platforms/wasm/qwasmscreen.cpp Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738		2020-02-18 09:26:53 +01:00
..
.gitignore	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00
double_data.h	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00
qstring.pro	Don't try to define QT_NO_CAST_TO_ASCII when the test undefines it	2019-10-25 11:41:44 +02:00
tst_qstring_mac.mm	Move text-related code out of corelib/tools/ to corelib/text/	2019-07-10 17:05:30 +02:00
tst_qstring.cpp	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-18 09:26:53 +01:00