qt5base-lts/tests/auto/other/lancelot
Liang Qi 096e37910d Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	.qmake.conf
	src/corelib/kernel/qeventdispatcher_cf.mm
	src/gui/kernel/qguiapplication_p.h
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/qioseventdispatcher.mm
	src/plugins/platforms/windows/qwindowsdrag.h
	src/plugins/platforms/windows/qwindowsinternalmimedata.h
	src/plugins/platforms/windows/qwindowsmime.cpp
	src/plugins/platforms/winrt/qwinrtscreen.cpp

Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
2018-06-07 19:10:53 +02:00
..
images Purge sRGB chunks from PNGs in tests. 2016-03-29 08:39:43 +00:00
scripts Fix drawTiledPixmap() and texture-brush painting with high-DPR images 2018-04-25 13:39:28 +00:00
.gitignore Moved integrationtests/* into other/ 2011-11-30 09:30:22 +01:00
images.qrc Moved integrationtests/* into other/ 2011-11-30 09:30:22 +01:00
lancelot.pro Do not always use argb32pm for subsurfaces 2017-05-31 18:53:57 +00:00
paintcommands.cpp Fix drawTiledPixmap() and texture-brush painting with high-DPR images 2018-04-25 13:39:28 +00:00
paintcommands.h Fix drawTiledPixmap() and texture-brush painting with high-DPR images 2018-04-25 13:39:28 +00:00
tst_lancelot.cpp Fix HDR format in QOpenGLFramebufferObject::toImage() 2018-06-06 10:48:36 +00:00