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

Conflicts:
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/gui/painting/qdrawhelper.cpp
	src/plugins/platforms/xcb/qxcbnativeinterface.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/testlib/qtestblacklist.cpp
	src/tools/qdoc/node.cpp
	src/tools/qdoc/node.h
	tests/auto/gui/painting/qcolor/tst_qcolor.cpp

Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684

1 files changed, 38 insertions, 0 deletions

diff --git a/src/3rdparty/angle/src/compiler/translator/SimplifyArrayAssignment.cpp b/src/3rdparty/angle/src/compiler/translator/SimplifyArrayAssignment.cpp
new file mode 100644
index 0000000000..ac5eb67070
--- /dev/null
+++ b/src/3rdparty/angle/src/compiler/translator/SimplifyArrayAssignment.cpp
@@ -0,0 +1,38 @@
+//
+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+#include "compiler/translator/SimplifyArrayAssignment.h"
+
+bool SimplifyArrayAssignment::visitBinary(Visit visit, TIntermBinary *node)
+{
+    switch (node->getOp())
+    {
+      case EOpAssign:
+        {
+            TIntermNode *parent = getParentNode();
+            if (node->getLeft()->isArray() && parent != nullptr)
+            {
+                TIntermAggregate *parentAgg = parent->getAsAggregate();
+                if (parentAgg != nullptr && parentAgg->getOp() == EOpSequence)
+                {
+                    // This case is fine, the result of the assignment is not used.
+                    break;
+                }
+
+                // The result of the assignment needs to be stored into a temporary variable,
+                // the assignment needs to be replaced with a reference to the temporary variable,
+                // and the temporary variable needs to finally be assigned to the target variable.
+
+                // This also needs to interact correctly with unfolding short circuiting operators.
+                UNIMPLEMENTED();
+            }
+        }
+        break;
+      default:
+        break;
+    }
+    return true;
+}