Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/platforms/eglfs/qeglfshooks.cpp

Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2

1 files changed, 8 insertions, 4 deletions

diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index dd742b6007..000d727380 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -42,6 +42,7 @@
 #include <QtCore/qatomic.h>
 #include <QtCore/QDebug>
 #include <QOpenGLContext>
+#include <QtGui/qguiapplication.h>
 
 #ifdef major
 #undef major
@@ -763,10 +764,13 @@ Q_GLOBAL_STATIC(QSurfaceFormat, qt_default_surface_format)
 void QSurfaceFormat::setDefaultFormat(const QSurfaceFormat &format)
 {
 #ifndef QT_NO_OPENGL
-    QOpenGLContext *globalContext = QOpenGLContext::globalShareContext();
-    if (globalContext && globalContext->isValid()) {
-        qWarning("Warning: Setting a new default format with a different version or profile after "
-                 "the global shared context is created may cause issues with context sharing.");
+    if (qApp) {
+        QOpenGLContext *globalContext = QOpenGLContext::globalShareContext();
+        if (globalContext && globalContext->isValid()) {
+            qWarning("Warning: Setting a new default format with a different version or profile "
+                     "after the global shared context is created may cause issues with context "
+                     "sharing.");
+        }
     }
 #endif
     *qt_default_surface_format() = format;