Liang Qi e28e91ae99 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/animation/qpropertyanimation.cpp src/gui/image/qicon.cpp tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21		2018-10-25 07:21:53 +02:00
..
.gitignore
datastream.q42
qdatastream.pro
testdata.qrc
tst_qdatastream.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2018-10-25 07:21:53 +02:00