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

4 files changed, 11 insertions, 40 deletions

diff --git a/examples/itemviews/README b/examples/itemviews/README
index 0ac70f4904..bded96a849 100644
--- a/examples/itemviews/README
+++ b/examples/itemviews/README
@@ -4,36 +4,5 @@ from the way it is represented to the user, and provides support for
 customized rendering through the use of delegates.
 
 
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory.
-
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Examples
 link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/itemviews/interview/interview.pro b/examples/itemviews/interview/interview.pro
index bf39328e99..fec3ec1168 100644
--- a/examples/itemviews/interview/interview.pro
+++ b/examples/itemviews/interview/interview.pro
@@ -11,10 +11,10 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/interview
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
 sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/interview
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/interview
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
-QT += widgets widgets
+QT += widgets
+symbian: CONFIG += qt_example
diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro
index d82e1ee0c0..3048aa18d6 100644
--- a/examples/itemviews/itemviews.pro
+++ b/examples/itemviews/itemviews.pro
@@ -8,12 +8,14 @@ SUBDIRS       = addressbook \
                 editabletreemodel \
                 fetchmore \
                 frozencolumn \
+                interview \
                 pixelator \
                 puzzle \
                 simpledommodel \
                 simpletreemodel \
                 simplewidgetmapper \
-                spinboxdelegate
+                spinboxdelegate \
+                spreadsheet
 
 # install
 sources.files = README *.pro
diff --git a/examples/itemviews/spreadsheet/spreadsheet.pro b/examples/itemviews/spreadsheet/spreadsheet.pro
index dc079866a3..6a3d8b5983 100644
--- a/examples/itemviews/spreadsheet/spreadsheet.pro
+++ b/examples/itemviews/spreadsheet/spreadsheet.pro
@@ -27,9 +27,9 @@ build_all:!build_pass {
 }
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/spreadsheet
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
 sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/spreadsheet
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spreadsheet
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
+symbian: CONFIG += qt_example