Merge branch 'refactor'

Conflicts:
	mkspecs/qws/linux-lsb-g++/qmake.conf
	src/gui/image/qpixmap_mac.cpp
	src/gui/painting/qpaintengine_x11.cpp
	src/gui/painting/qtessellator.cpp
	src/gui/text/qfontengine_qws.cpp
	src/gui/text/qfontengine_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/opengl/qgl.h
	src/opengl/qgl_x11egl.cpp
	src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310

1 files changed, 0 insertions, 16 deletions

diff --git a/src/opengl/util/simple_porter_duff.glsl b/src/opengl/util/simple_porter_duff.glsl
deleted file mode 100644
index 4cb0599ac5..0000000000
--- a/src/opengl/util/simple_porter_duff.glsl
+++ /dev/null
@@ -1,16 +0,0 @@
-uniform vec2 porterduff_ab;
-uniform vec3 porterduff_xyz;
-
-vec4 composite(vec4 src, vec4 dst)
-{
-    vec4 result;
-
-    result.xyz = porterduff_ab.x * src.xyz * dst.a
-               + porterduff_ab.y * dst.xyz * src.a
-               + porterduff_xyz.y * src.xyz * (1.0 - dst.a)
-               + porterduff_xyz.z * dst.xyz * (1.0 - src.a);
-
-    result.a = dot(porterduff_xyz, vec3(src.a * dst.a, src.a * (1.0 - dst.a), dst.a * (1.0 - src.a)));
-
-    return result;
-}