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, 55 deletions

diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/ShaderImpl.h b/src/3rdparty/angle/src/libGLESv2/renderer/ShaderImpl.h
deleted file mode 100644
index cb0d360f0b..0000000000
--- a/src/3rdparty/angle/src/libGLESv2/renderer/ShaderImpl.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright 2014 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.
-//
-
-// ShaderImpl.h: Defines the abstract rx::ShaderImpl class.
-
-#ifndef LIBGLESV2_RENDERER_SHADERIMPL_H_
-#define LIBGLESV2_RENDERER_SHADERIMPL_H_
-
-#include <vector>
-
-#include "common/angleutils.h"
-#include "libGLESv2/Shader.h"
-
-namespace rx
-{
-
-class ShaderImpl
-{
-  public:
-    ShaderImpl() { }
-    virtual ~ShaderImpl() { }
-
-    virtual bool compile(const gl::Data &data, const std::string &source) = 0;
-    virtual const std::string &getInfoLog() const = 0;
-    virtual const std::string &getTranslatedSource() const = 0;
-    virtual std::string getDebugInfo() const = 0;
-
-    const std::vector<gl::PackedVarying> &getVaryings() const { return mVaryings; }
-    const std::vector<sh::Uniform> &getUniforms() const { return mUniforms; }
-    const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const  { return mInterfaceBlocks; }
-    const std::vector<sh::Attribute> &getActiveAttributes() const { return mActiveAttributes; }
-    const std::vector<sh::Attribute> &getActiveOutputVariables() const { return mActiveOutputVariables; }
-
-    std::vector<gl::PackedVarying> &getVaryings() { return mVaryings; }
-    std::vector<sh::Uniform> &getUniforms() { return mUniforms; }
-    std::vector<sh::InterfaceBlock> &getInterfaceBlocks() { return mInterfaceBlocks; }
-    std::vector<sh::Attribute> &getActiveAttributes() { return mActiveAttributes; }
-    std::vector<sh::Attribute> &getActiveOutputVariables() { return mActiveOutputVariables; }
-
-  protected:
-    DISALLOW_COPY_AND_ASSIGN(ShaderImpl);
-
-    std::vector<gl::PackedVarying> mVaryings;
-    std::vector<sh::Uniform> mUniforms;
-    std::vector<sh::InterfaceBlock> mInterfaceBlocks;
-    std::vector<sh::Attribute> mActiveAttributes;
-    std::vector<sh::Attribute> mActiveOutputVariables;
-};
-
-}
-
-#endif // LIBGLESV2_RENDERER_SHADERIMPL_H_