Merge branch 'gl2engine-new-shaders' into graphics-master

Conflicts:
	src/gui/painting/qpaintengine_raster.cpp

2 files changed, 5 insertions, 4 deletions

diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index 3d8d34b..d238830 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -156,7 +156,7 @@ QGLEngineShaderManager::QGLEngineShaderManager(QGLContext* context)
     simpleShaderProg->link();
     if (!simpleShaderProg->isValid()) {
         qCritical() << "Errors linking simple shader:"
-                    << simpleShaderProg->errors();
+                    << simpleShaderProg->log();
     }
 }
 
@@ -432,7 +432,7 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
               << "    compositionFragShader = "<< requiredProgram.compositionFragShader->objectName() << '\n'
 #endif
               << "  Error Log:" << '\n'
-              << "    " << requiredProgram.program->errors();
+              << "    " << requiredProgram.program->log();
         qWarning() << error;
     }
     else {
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 7dbdc32..1c0d7e0 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1059,8 +1059,9 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     d->height = sz.height();
     d->mode = BrushDrawingMode;
 
-    qt_resolve_version_1_3_functions(d->ctx);
-    qt_resolve_glsl_extensions(d->ctx);
+#if !defined(QT_OPENGL_ES_2)
+    qt_resolve_version_2_0_functions(d->ctx);
+#endif
 
     d->last_engine = d->ctx->d_ptr->active_engine;
     d->ctx->d_ptr->active_engine = this;