qt5base-lts/tests/auto/gui/painting/qpainter
Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
	mkspecs/android-g++/qmake.conf
	qmake/generators/unix/unixmake2.cpp
	src/gui/image/qimage_conversions.cpp

Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
2015-03-31 10:03:31 +02:00
..
drawEllipse Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
drawLine_rop_bitmap Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
drawPixmap_rop Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
drawPixmap_rop_bitmap Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
utils/createImages Update copyright headers 2015-02-11 06:49:51 +00:00
.gitignore Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
qpainter.pro Android: Fix QPainter autotest 2015-01-08 10:03:27 +01:00
task217400.png Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
testdata.qrc Android: Fix QPainter autotest 2015-01-08 10:03:27 +01:00
tst_qpainter.cpp Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-31 10:03:31 +02:00