From 33bbdb88216e72bcc3149f52e7a961609f5406a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?=
 <pasi.petajajarvi@digia.com>
Date: Tue, 15 Jan 2013 15:06:42 +0200
Subject: Use correct variable type EGLint for EGL attributes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

EGL property is type EGLint and is defined in eglplatform.h header as
typedef khronos_int32_t EGLint;

Change-Id: I3ace17447aa9a83655b6fa6b4246a6a16592936c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
 src/gui/egl/qegl.cpp           | 2 +-
 src/gui/egl/qeglproperties_p.h | 4 ++--
 src/opengl/qgl_qws.cpp         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index 7526e25..973a159 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -684,7 +684,7 @@ EGLSurface QEgl::createSurface(QPaintDevice *device, EGLConfig cfg, const QEglPr
     }
 
     // Create the EGL surface to draw into, based on the native drawable.
-    const int *props;
+    const EGLint *props;
     if (properties)
         props = properties->properties();
     else
diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h
index baae5d7..a57c11f 100644
--- a/src/gui/egl/qeglproperties_p.h
+++ b/src/gui/egl/qeglproperties_p.h
@@ -76,7 +76,7 @@ public:
     bool removeValue(int name);
     bool isEmpty() const { return props[0] == EGL_NONE; }
 
-    const int *properties() const { return props.constData(); }
+    EGLconst int *properties() const { return props.constData(); }
 
     void setPixelFormat(QImage::Format pixelFormat);
 #ifdef Q_WS_X11
@@ -91,7 +91,7 @@ public:
     QString toString() const;
 
 private:
-    QVarLengthArray<int> props;
+    QVarLengthArray<EGLint> props;
 };
 
 QT_END_NAMESPACE
diff --git a/src/opengl/qgl_qws.cpp b/src/opengl/qgl_qws.cpp
index 4aeb95a..1da8a9d 100644
--- a/src/opengl/qgl_qws.cpp
+++ b/src/opengl/qgl_qws.cpp
@@ -149,7 +149,7 @@ static EGLSurface qt_egl_create_surface
     }
 
     // Create the EGL surface to draw into, based on the native drawable.
-    const int *props;
+    const EGLint *props;
     if (properties)
         props = properties->properties();
     else
-- 
cgit v0.12