Liang Qi a503bf5470 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/tools/qvector.h Make QVector(DataPointer dd) public to be able to properly merge 5b4b437b30 from 5.15 into dev. src/widgets/kernel/qapplication.cpp tests/auto/tools/moc/allmocs_baseline_in.json Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de> Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01		2020-01-04 15:32:34 +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.15' into dev	2020-01-04 15:32:34 +01:00