qt5base-lts/tests/auto/corelib/tools/qmap
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 Moving relevant tests to corelib/tools 2011-09-01 13:07:23 +02:00
qmap.pro Add QT_NO_JAVA_STYLE_ITERATORS and mark QtBase free of it 2019-07-03 14:48:37 +02:00
tst_qmap.cpp Merge remote-tracking branch 'origin/5.15' into dev 2020-01-04 15:32:34 +01:00