Simon Hausmann ff922e7b87 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a		2020-03-16 18:41:27 +01:00
..
.gitignore	…
CMakeLists.txt	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qtextlayout.pro	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
tst_qtextlayout.cpp	Fix non-trivial soft-hyphen line breaks	2020-03-10 21:58:21 +01:00