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, 0 insertions, 106 deletions

diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/shaders/Clear11.hlsl b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/shaders/Clear11.hlsl
deleted file mode 100644
index b4cf38076e..0000000000
--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/shaders/Clear11.hlsl
+++ /dev/null
@@ -1,106 +0,0 @@
-// Assume we are in SM4+, which has 8 color outputs
-
-void VS_ClearFloat( in float3  inPosition :    POSITION,  in float4  inColor : COLOR,
-                   out float4 outPosition : SV_POSITION, out float4 outColor : COLOR)
-{
-    outPosition = float4(inPosition, 1.0f);
-    outColor = inColor;
-}
-
-struct PS_OutputFloat
-{
-    float4 color0 : SV_TARGET0;
-    float4 color1 : SV_TARGET1;
-    float4 color2 : SV_TARGET2;
-    float4 color3 : SV_TARGET3;
-#if SM4
-    float4 color4 : SV_TARGET4;
-    float4 color5 : SV_TARGET5;
-    float4 color6 : SV_TARGET6;
-    float4 color7 : SV_TARGET7;
-#endif
-};
-
-PS_OutputFloat PS_ClearFloat(in float4 inPosition : SV_POSITION, in float4 inColor : COLOR)
-{
-    PS_OutputFloat outColor;
-    outColor.color0 = inColor;
-    outColor.color1 = inColor;
-    outColor.color2 = inColor;
-    outColor.color3 = inColor;
-#if SM4
-    outColor.color4 = inColor;
-    outColor.color5 = inColor;
-    outColor.color6 = inColor;
-    outColor.color7 = inColor;
-#endif
-    return outColor;
-}
-
-
-void VS_ClearUint( in float3  inPosition :    POSITION,   in uint4  inColor : COLOR,
-                   out float4 outPosition : SV_POSITION, out uint4 outColor : COLOR)
-{
-    outPosition = float4(inPosition, 1.0f);
-    outColor = inColor;
-}
-
-struct PS_OutputUint
-{
-    uint4 color0 : SV_TARGET0;
-    uint4 color1 : SV_TARGET1;
-    uint4 color2 : SV_TARGET2;
-    uint4 color3 : SV_TARGET3;
-    uint4 color4 : SV_TARGET4;
-    uint4 color5 : SV_TARGET5;
-    uint4 color6 : SV_TARGET6;
-    uint4 color7 : SV_TARGET7;
-};
-
-PS_OutputUint PS_ClearUint(in float4 inPosition : SV_POSITION, in uint4 inColor : COLOR)
-{
-    PS_OutputUint outColor;
-    outColor.color0 = inColor;
-    outColor.color1 = inColor;
-    outColor.color2 = inColor;
-    outColor.color3 = inColor;
-    outColor.color4 = inColor;
-    outColor.color5 = inColor;
-    outColor.color6 = inColor;
-    outColor.color7 = inColor;
-    return outColor;
-}
-
-
-void VS_ClearSint( in float3  inPosition :    POSITION,   in int4  inColor : COLOR,
-                   out float4 outPosition : SV_POSITION, out int4 outColor : COLOR)
-{
-    outPosition = float4(inPosition, 1.0f);
-    outColor = inColor;
-}
-
-struct PS_OutputSint
-{
-    int4 color0 : SV_TARGET0;
-    int4 color1 : SV_TARGET1;
-    int4 color2 : SV_TARGET2;
-    int4 color3 : SV_TARGET3;
-    int4 color4 : SV_TARGET4;
-    int4 color5 : SV_TARGET5;
-    int4 color6 : SV_TARGET6;
-    int4 color7 : SV_TARGET7;
-};
-
-PS_OutputSint PS_ClearSint(in float4 inPosition : SV_POSITION, in int4 inColor : COLOR)
-{
-    PS_OutputSint outColor;
-    outColor.color0 = inColor;
-    outColor.color1 = inColor;
-    outColor.color2 = inColor;
-    outColor.color3 = inColor;
-    outColor.color4 = inColor;
-    outColor.color5 = inColor;
-    outColor.color6 = inColor;
-    outColor.color7 = inColor;
-    return outColor;
-}