Merge remote-tracking branch 'origin/release' into stable

Manually fixed up: isES -> isOpenGLES
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp

Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5

2 files changed, 2 insertions, 8 deletions

diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h
index c422d008c1..19aecee75a 100644
--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@@ -196,19 +196,13 @@ public:
 
     enum OpenGLModuleType {
         LibGL,
-        LibGLES,
-
-        // ###
-        DesktopGL = LibGL,
-        GLES2 = LibGLES
+        LibGLES
     };
 
     static OpenGLModuleType openGLModuleType();
 
     bool isOpenGLES() const;
 
-    bool isES() const { return isOpenGLES(); } // ###
-
 Q_SIGNALS:
     void aboutToBeDestroyed();
 
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 3278b7233c..0d13cfa648 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -297,7 +297,7 @@ Q_SIGNALS:
     void screenChanged(QScreen *screen);
     void modalityChanged(Qt::WindowModality modality);
     void windowStateChanged(Qt::WindowState windowState);
-    void windowTitleChanged(const QString &title);
+    Q_REVISION(2) void windowTitleChanged(const QString &title);
 
     void xChanged(int arg);
     void yChanged(int arg);