Merge remote branch 'gerrit/master' into refactor

Conflicts:
	config.tests/unix/opengldesktop/opengldesktop.cpp
	examples/itemviews/interview/interview.pro
	examples/mainwindows/mainwindow/mainwindow.pro
	examples/openvg/README
	examples/richtext/textedit/textedit.pro
	examples/tools/undo/undo.pro
	src/corelib/global/qglobal.h
	src/corelib/kernel/qcoreapplication.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qmetatype.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qevent.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qpaintengine_raster_p.h
	src/gui/text/qfontdatabase.cpp
	src/opengl/qgl.h
	src/openvg/qpaintengine_vg.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	tests/auto/qmainwindow/qmainwindow.pro

Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234

1 files changed, 0 insertions, 176 deletions

diff --git a/tests/arthur/data/qps/lines2.qps b/tests/arthur/data/qps/lines2.qps
deleted file mode 100644
index d1a658c46d..0000000000
--- a/tests/arthur/data/qps/lines2.qps
+++ /dev/null
@@ -1,176 +0,0 @@
-translate 10 20
-drawText 0 0 "Thin lines"
-
-translate 60 70
-
-save
-begin_block lines
-translate 0 -60
-translate 0 5
-setPen 0x000000 0.05
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.1
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.15
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.2
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.25
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.3
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.35
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.2
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.25
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.5
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.55
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.6
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.65
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.7
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.75
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.8
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.85
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.9
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 0.95
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.05
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.1
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.15
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.2
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.25
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.3
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.35
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.2
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.25
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.5
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.55
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.6
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.65
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.7
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.75
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.8
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.85
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.9
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 1.95
-drawLine -60 -2 60 2
-translate 0 5
-setPen 0x000000 2
-drawLine -60 -2 60 2
-end_block
-restore
-
-save
-translate 150 0
-scale -1 1
-repeat_block lines
-restore
-
-save
-translate 80 220
-rotate 90
-repeat_block lines
-restore
-
-save
-translate 80 370
-rotate 90
-scale -1 1
-repeat_block lines
-restore
-
-setRenderHint Antialiasing
-
-translate 300 0
-
-save
-repeat_block lines
-restore
-
-save
-translate 150 0
-scale -1 1
-repeat_block lines
-restore
-
-save
-translate 80 220
-rotate 90
-repeat_block lines
-restore
-
-save
-translate 80 370
-rotate 90
-scale -1 1
-repeat_block lines
-restore