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

2 files changed, 135 insertions, 7 deletions

diff --git a/dist/README b/dist/README
index 73c8be1f5d..815e12be9e 100644
--- a/dist/README
+++ b/dist/README
@@ -31,16 +31,14 @@ follow these instructions:
 http://qt.nokia.com/doc/%SHORTVERSION%/install-symbian-installer.html
 
 
-DEMOS AND EXAMPLES
+EXAMPLES
 
-Once Qt is installed, we suggest that you take a look at the demos and
-examples to see Qt in action.
+Once Qt is installed, we suggest that you take a look at the examples
+to see Qt in action.
 
-For desktop computers, run the Qt Examples and Demos either by
-typing 'qtdemo' on the command line or through the desktop's Start
-menu. On Mac OS X, you can find it in /Developers/Applications/Qt.
+For desktop computers, run the Qt Examples by opening them in Qt Creator.
 
-For embedded devices, launch the Qt 'fluidlauncher' demo, either through 
+For embedded devices, launch the Qt 'fluidlauncher' example, either through
 the platforms filebrowser or the built in menu system.
 
 
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
new file mode 100644
index 0000000000..4c226aa9d6
--- /dev/null
+++ b/dist/changes-5.0.0
@@ -0,0 +1,130 @@
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt.nokia.com/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                       Source incompatible changes                        *
+****************************************************************************
+
+- QSslCertificate::subjectInfo() and QSslCertificate::issuerInfo() now
+  return a QStringList instead of a QString
+
+- Unite clipping support has been removed from QPainter. The alternative is
+  to unite QRegion's and using the result on QPainter.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+-
+
+Third party components
+----------------------
+
+-
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtCore
+------
+
+QtGui
+-----
+
+QtNetwork
+---------
+
+QtOpenGL
+--------
+
+QtScript
+--------
+
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Linux/X11
+----------------
+
+
+Qt for Windows
+--------------
+
+
+Qt for Mac OS X
+---------------
+
+
+Qt for Embedded Linux
+---------------------
+
+
+Qt for Windows CE
+-----------------
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+
+- Assistant
+
+- Designer
+
+- Linguist
+
+- rcc
+
+
+- moc
+
+
+- uic
+
+
+- uic3
+
+
+- qmake
+
+
+- configure
+
+
+- qtconfig
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+