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

Conflicts:
	.qmake.conf

Change-Id: I72eda5a6e51d805637fc8b8091f533e51e645b6a

7 files changed, 64 insertions, 13 deletions

diff --git a/dist/changes-5.8.0 b/dist/changes-5.8.0
new file mode 100644
index 0000000..a56ff5e
--- /dev/null
+++ b/dist/changes-5.8.0
@@ -0,0 +1,32 @@
+Qt 5.8 introduces many new features and improvements as well as bugfixes
+over the 5.7.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.8 series is binary compatible with the 5.7.x series.
+Applications compiled for 5.7 will continue to run with 5.8.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+ - [QTBUG-54466] Fix crash when QOpenGLContext::currentContext() is NULL.
+ - [QTBUG-54876] Aligned pixel-row of the image passed to glTexImage2D to
+                 UNPACK_ALIGN.
+ - [QTBUG-56673] Improved software opengl renderer detection.
+ - Fixed quadratic loop in CanvasTextureImageFactory.
+
+****************************************************************************
+*                          Examples                                        *
+****************************************************************************
+
+ - [QTBUG-50393] Fix cellphone example flicking
diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 0000000..e33a407
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,16 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
diff --git a/examples/canvas3d/framebuffer/main.cpp b/examples/canvas3d/framebuffer/main.cpp
index 1de981a..c91b83c 100644
--- a/examples/canvas3d/framebuffer/main.cpp
+++ b/examples/canvas3d/framebuffer/main.cpp
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 
     viewer.setTitle(QStringLiteral("Render into FrameBuffer"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
-    viewer.setColor("#f2f2f2");
+    viewer.setColor(QColor(0xf2, 0xf2, 0xf2));
     viewer.show();
 
     return app.exec();
diff --git a/examples/canvas3d/interaction/main.cpp b/examples/canvas3d/interaction/main.cpp
index 7ba99a2..fa2b8fa 100644
--- a/examples/canvas3d/interaction/main.cpp
+++ b/examples/canvas3d/interaction/main.cpp
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 
     viewer.setTitle(QStringLiteral("Interaction"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
-    viewer.setColor("#fafafa");
+    viewer.setColor(QColor(0xfa, 0xfa, 0xfa));
     viewer.show();
 
     return app.exec();
diff --git a/examples/canvas3d/textureandlight/main.cpp b/examples/canvas3d/textureandlight/main.cpp
index daf980f..be1bb85 100644
--- a/examples/canvas3d/textureandlight/main.cpp
+++ b/examples/canvas3d/textureandlight/main.cpp
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 
     viewer.setTitle(QStringLiteral("Textured and Lit Cube"));
     viewer.setResizeMode(QQuickView::SizeRootObjectToView);
-    viewer.setColor("#fafafa");
+    viewer.setColor(QColor(0xfa, 0xfa, 0xfa));
     viewer.show();
 
     return app.exec();
diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp
index 9040ccd..7b2e590 100644
--- a/src/imports/qtcanvas3d/context3d.cpp
+++ b/src/imports/qtcanvas3d/context3d.cpp
@@ -5856,9 +5856,9 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D)
                                   locationId);
         switch (type) {
         case SAMPLER_2D:
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case SAMPLER_CUBE:
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case INT: {
             GLint value = 0;
             syncCommand.returnValue = &value;
@@ -5889,10 +5889,10 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D)
         }
         case INT_VEC2:
             numValues--;
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case INT_VEC3:
             numValues--;
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case INT_VEC4: {
             QV4::Scope scope(m_v4engine);
             QV4::Scoped<QV4::ArrayBuffer> buffer(scope,
@@ -5914,10 +5914,10 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D)
         }
         case FLOAT_VEC2:
             numValues--;
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case FLOAT_VEC3:
             numValues--;
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case FLOAT_VEC4: {
             QV4::Scope scope(m_v4engine);
             QV4::Scoped<QV4::ArrayBuffer> buffer(scope,
@@ -5940,10 +5940,10 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D)
         }
         case BOOL_VEC2:
             numValues--;
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case BOOL_VEC3:
             numValues--;
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case BOOL_VEC4: {
             GLint *value = new GLint[numValues];
             QJSValue array = m_engine->newArray(numValues);
@@ -5962,10 +5962,10 @@ QJSValue CanvasContext::getUniform(QJSValue program3D, QJSValue location3D)
         }
         case FLOAT_MAT2:
             numValues--;
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case FLOAT_MAT3:
             numValues--;
-            // Intentional flow through
+            Q_FALLTHROUGH(); // Intentional flow through
         case FLOAT_MAT4: {
             numValues = numValues * numValues;
             QV4::Scope scope(m_v4engine);
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 1bcf14e..b05fadc 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,3 +2,6 @@ TEMPLATE = subdirs
 !uikit: SUBDIRS += qmltest
 
 installed_cmake.depends = cmake
+
+# Currently qmltest crashes for boot2qt
+boot2qt: SUBDIRS -= qmltest