Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/corelib/global/global.pri
	src/corelib/global/qcompilerdetection.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qdatetime.cpp
	src/plugins/platforms/xcb/qxcbscreen.h
	src/plugins/platforms/xcb/qxcbwindow.h
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qcolordialog_p.h
	tools/configure/configureapp.cpp

Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af

3 files changed, 12 insertions, 6 deletions

diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 1cd67b19d2..3fccd6ba9a 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -518,8 +518,9 @@ void QOpenGLContext::setScreen(QScreen *screen)
     in addition. Therefore \a handle is variant containing a platform-specific
     value type. These classes can be found in the QtPlatformHeaders module.
 
-    When create() is called with native handles set, the handles' ownership are
-    not taken, meaning that \c destroy() will not destroy the native context.
+    When create() is called with native handles set, QOpenGLContext does not
+    take ownership of the handles, so destroying the QOpenGLContext does not
+    destroy the native context.
 
     \note Some frameworks track the current context and surfaces internally.
     Making the adopted QOpenGLContext current via Qt will have no effect on such
@@ -582,8 +583,8 @@ QVariant QOpenGLContext::nativeHandle() const
     Returns \c true if the native context was successfully created and is ready to
     be used with makeCurrent(), swapBuffers(), etc.
 
-    \note If the context is already created, this function will first call
-    \c destroy(), and then create a new OpenGL context.
+    \note If the context already exists, this function destroys the existing
+    context first, and then creates a new one.
 
     \sa makeCurrent(), format()
 */
@@ -606,6 +607,8 @@ bool QOpenGLContext::create()
 }
 
 /*!
+    \internal
+
     Destroy the underlying platform context associated with this context.
 
     If any other context is directly or indirectly sharing resources with this
@@ -659,8 +662,7 @@ void QOpenGLContext::destroy()
 /*!
     Destroys the QOpenGLContext object.
 
-    This implicitly calls \c destroy(), so if this is the current context for the
-    thread, doneCurrent() is also called.
+    If this is the current context for the thread, doneCurrent() is also called.
 */
 QOpenGLContext::~QOpenGLContext()
 {
diff --git a/src/gui/kernel/qplatformservices.cpp b/src/gui/kernel/qplatformservices.cpp
index e11a1858f6..2188920c86 100644
--- a/src/gui/kernel/qplatformservices.cpp
+++ b/src/gui/kernel/qplatformservices.cpp
@@ -49,6 +49,9 @@ QT_BEGIN_NAMESPACE
     \brief The QPlatformServices provides the backend for desktop-related functionality.
 */
 
+QPlatformServices::QPlatformServices()
+{ }
+
 bool QPlatformServices::openUrl(const QUrl &url)
 {
     qWarning("This plugin does not support QPlatformServices::openUrl() for '%s'.",
diff --git a/src/gui/kernel/qplatformservices.h b/src/gui/kernel/qplatformservices.h
index 00a87d51f5..005748d18c 100644
--- a/src/gui/kernel/qplatformservices.h
+++ b/src/gui/kernel/qplatformservices.h
@@ -52,6 +52,7 @@ class QUrl;
 class Q_GUI_EXPORT QPlatformServices
 {
 public:
+    QPlatformServices();
     virtual ~QPlatformServices() { }
 
     virtual bool openUrl(const QUrl &url);