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

Change-Id: I9c6f6ae4cfc72fc350fffc2ff1edf113d783a8f6

.qmake.conf

 load(qt_build_config)
-CONFIG += qt_example_installs
 
 MODULE_VERSION = 5.7.1
 

LICENSE.GPLv2

@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU General Public License version 2, which is displayed below.
 
 -------------------------------------------------------------------------

LICENSE.GPLv3

@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.

LICENSE.LGPLv3

@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.

src/imports/qtcanvas3d/renderjob.cpp

@@ -85,7 +85,9 @@ void CanvasRenderJob::run()
         QSurface *oldSurface(0);
         if (!m_renderer->usingQtContext()) {
             oldContext = QOpenGLContext::currentContext();
-            oldSurface = oldContext->surface();
+            if (oldContext)
+                oldSurface = oldContext->surface();
+
             m_renderer->makeCanvasContextCurrent();
         }
 

tests/manual/commandthroughput/qml/commandthroughput/commandthroughput.js

@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-Qt.include("../../../examples/canvas3d/canvas3d/3rdparty/gl-matrix.js")
+Qt.include("../../../examples/canvas3d/3rdparty/gl-matrix.js")
 
 //
 // Draws a cube that has the Qt logo as decal texture on each face in to a texture.