qt5base-lts/tests/auto/gui/painting/qpainter
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
2016-11-01 06:02:55 +01: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
qpainter.pro Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +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 Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00