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
..
testdata/scanner	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qcssparser.pro	update testdata	2016-08-31 10:00:29 +00:00
testdata.qrc	Android: Fix tests in gui/text requiring test data	2014-07-21 09:49:09 +02:00
tst_qcssparser.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2018-10-25 07:21:53 +02:00