Merge commit 'qt/master'

4 files changed, 19 insertions, 3 deletions

diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index 9d0ead1..f0df0c9 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -402,7 +402,7 @@ void QEglContext::dumpAllConfigs()
 
 QString QEglContext::extensions()
 {
-    const char* exts = eglQueryString(dpy, EGL_EXTENSIONS);
+    const char* exts = eglQueryString(QEglContext::defaultDisplay(0), EGL_EXTENSIONS);
     return QString(QLatin1String(exts));
 }
 
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index bba5e59..97730d8 100644
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -122,8 +122,8 @@ public:
 
     void dumpAllConfigs();
 
-    QString extensions();
-    bool hasExtension(const char* extensionName);
+    static QString extensions();
+    static bool hasExtension(const char* extensionName);
 
 private:
     QEgl::API apiType;
diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp
index 22b55fe..7b582c4 100644
--- a/src/gui/egl/qeglproperties.cpp
+++ b/src/gui/egl/qeglproperties.cpp
@@ -257,6 +257,20 @@ static void addTag(QString& str, const QString& tag)
     str += tag;
 }
 
+void QEglProperties::dumpAllConfigs()
+{
+    EGLint count = 0;
+    eglGetConfigs(QEglContext::defaultDisplay(0), 0, 0, &count);
+    if (count < 1)
+        return;
+
+    EGLConfig *configs = new EGLConfig [count];
+    eglGetConfigs(QEglContext::defaultDisplay(0), configs, count, &count);
+    for (EGLint index = 0; index < count; ++index)
+        qWarning() << QEglProperties(configs[index]).toString();
+    delete [] configs;
+}
+
 // Convert a property list to a string suitable for debug output.
 QString QEglProperties::toString() const
 {
diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h
index 4ef3814..383a873 100644
--- a/src/gui/egl/qeglproperties_p.h
+++ b/src/gui/egl/qeglproperties_p.h
@@ -130,6 +130,8 @@ public:
 
     QString toString() const;
 
+    static void dumpAllConfigs();
+
 private:
     QVarLengthArray<int> props;
 };