qt5base-lts/tests/auto/gui/painting/qpainter
Liang Qi e3ed2281c0 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_dragging.mm
	src/plugins/platforms/ios/qiosinputcontext.mm
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/tools/androiddeployqt/main.cpp
		Was moved from qttools into qtbase in 5.11.
		So re-apply 32398e4d here.
	tests/auto/corelib/global/qlogging/test/test.pro
	tests/auto/corelib/global/qlogging/tst_qlogging.cpp
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
	tests/auto/corelib/thread/qthreadstorage/test/test.pro
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
	tests/auto/widgets/kernel/qapplication/test/test.pro

Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
2018-07-02 11:23:45 +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 Updated license headers 2016-01-21 18:55:18 +00:00
.gitignore Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
BLACKLIST Android: Blacklist tst_QPainter::textOnTransparentImage 2018-06-28 07:33:15 +00:00
qpainter.pro Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flags 2018-01-20 18:16:59 +00: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 Tests: replace deprecated QDesktopWidget::screenGeometry() 2018-05-28 17:22:59 +00:00