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

3 files changed, 5 insertions, 35 deletions

diff --git a/examples/tools/README b/examples/tools/README
index b0926f2fb6..db5c107c82 100644
--- a/examples/tools/README
+++ b/examples/tools/README
@@ -5,36 +5,5 @@ Other classes provide application infrastructure support, handling plugin
 loading and managing configuration files.
 
 
-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/tools/tools.pro b/examples/tools/tools.pro
index fb138b188a..cfab2f9def 100644
--- a/examples/tools/tools.pro
+++ b/examples/tools/tools.pro
@@ -13,6 +13,7 @@ SUBDIRS       = codecs \
                 settingseditor \
                 styleplugin \
                 treemodelcompleter \
+                undo \
                 undoframework
 
 plugandpaint.depends = plugandpaintplugins
diff --git a/examples/tools/undo/undo.pro b/examples/tools/undo/undo.pro
index 89f06bdfc7..ace6e49e8a 100644
--- a/examples/tools/undo/undo.pro
+++ b/examples/tools/undo/undo.pro
@@ -10,10 +10,10 @@ build_all:!build_pass {
 RESOURCES += undo.qrc
 
 # install
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
 sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undo
 INSTALLS += target sources
 
-symbian: CONFIG += qt_demo
 QT += widgets 
+symbian: CONFIG += qt_example