Merge remote-tracking branch stable into dev

Conflicts:
	.qmake.conf
	src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
	src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
	src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
	src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
	src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
	src/plugins/platforms/qwayland-brcm-egl/main.cpp
	src/plugins/platforms/qwayland-egl/main.cpp
	src/plugins/platforms/qwayland-generic/main.cpp
	src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
	src/plugins/platforms/qwayland-xcomposite-glx/main.cpp

Change-Id: I957c9bee893a9e19fc8c93f0e51292007fb3a4a8

1 files changed, 0 insertions, 122 deletions

diff --git a/src/compositor/compositor_api/qwaylandsurfacetexturematerial.cpp b/src/compositor/compositor_api/qwaylandsurfacetexturematerial.cpp
deleted file mode 100644
index 9562457e2..000000000
--- a/src/compositor/compositor_api/qwaylandsurfacetexturematerial.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwaylandsurfacetexturematerial_p.h"
-#include <QtGui/QOpenGLContext>
-
-QT_BEGIN_NAMESPACE
-
-static const char wayland_surface_texture_material_vertex[] =
-           "uniform highp mat4 qt_Matrix;                      \n"
-           "attribute highp vec4 qt_VertexPosition;            \n"
-           "attribute highp vec2 qt_VertexTexCoord;            \n"
-           "varying highp vec2 qt_TexCoord;                    \n"
-           "void main() {                                      \n"
-           "    qt_TexCoord = qt_VertexTexCoord;               \n"
-           "    gl_Position = qt_Matrix * qt_VertexPosition;   \n"
-           "}";
-
-
-static const char wayland_surface_texture_opaque_material_fragment[] =
-           "varying highp vec2 qt_TexCoord;                    \n"
-           "uniform sampler2D qt_Texture;                      \n"
-           "uniform lowp float qt_Opacity;                     \n"
-           "void main() {                                      \n"
-           "    gl_FragColor = vec4(texture2D(qt_Texture, qt_TexCoord).rgb, 1.0) * qt_Opacity; \n"
-           "}";
-
-static const char wayland_surface_texture_material_fragment[] =
-           "varying highp vec2 qt_TexCoord;                    \n"
-           "uniform sampler2D qt_Texture;                      \n"
-           "uniform lowp float qt_Opacity;                     \n"
-           "void main() {                                      \n"
-           "    gl_FragColor = texture2D(qt_Texture, qt_TexCoord) * qt_Opacity; \n"
-           "}";
-
-QList<QByteArray> QWaylandSurfaceTextureMaterial::attributes() const
-{
-    QList<QByteArray> attributeList;
-    attributeList << "qt_VertexPosition";
-    attributeList << "qt_VertexTexCoord";
-    return attributeList;
-}
-
-void QWaylandSurfaceTextureMaterial::updateState(const QWaylandSurfaceTextureState *newState, const QWaylandSurfaceTextureState *oldState)
-{
-    Q_UNUSED(oldState);
-    newState->texture()->bind();
-}
-
-const char *QWaylandSurfaceTextureMaterial::vertexShader() const
-{
-    return wayland_surface_texture_material_vertex;
-}
-
-const char *QWaylandSurfaceTextureMaterial::fragmentShader() const
-{
-    return wayland_surface_texture_material_fragment;
-}
-
-QList<QByteArray> QWaylandSurfaceTextureOpaqueMaterial::attributes() const
-{
-    QList<QByteArray> attributeList;
-    attributeList << "qt_VertexPosition";
-    attributeList << "qt_VertexTexCoord";
-    return attributeList;
-}
-
-void QWaylandSurfaceTextureOpaqueMaterial::updateState(const QWaylandSurfaceTextureState *newState, const QWaylandSurfaceTextureState *oldState)
-{
-    Q_UNUSED(oldState);
-    newState->texture()->bind();
-}
-
-const char *QWaylandSurfaceTextureOpaqueMaterial::vertexShader() const
-{
-    return wayland_surface_texture_material_vertex;
-}
-
-const char *QWaylandSurfaceTextureOpaqueMaterial::fragmentShader() const
-{
-    return wayland_surface_texture_opaque_material_fragment;
-}
-
-QT_END_NAMESPACE