Merge commit 'qt/master-stable'

Conflicts:
	config.tests/unix/openssl/openssl.pri
	demos/embedded/embedded.pro
	examples/itemviews/chart/chart.pro
	examples/network/network.pro
	examples/painting/painterpaths/painterpaths.pro
	examples/threads/mandelbrot/mandelbrot.pro
	qmake/project.cpp
	src/3rdparty/libtiff/libtiff/tif_config.h
	src/corelib/arch/arch.pri
	src/corelib/global/qglobal.cpp
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcore_unix_p.h
	src/corelib/kernel/qobject.cpp
	src/corelib/thread/qthread_unix.cpp
	src/corelib/tools/qsharedpointer_impl.h
	src/corelib/tools/tools.pri
	src/gui/kernel/qaction.h
	src/gui/kernel/qapplication.cpp
	src/gui/painting/qregion.h
	src/gui/widgets/qlineedit.cpp
	src/gui/widgets/qlineedit_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qdiriterator/tst_qdiriterator.cpp
	tests/auto/qhttp/qhttp.pro
	tests/auto/qline/qline.pro
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qresourceengine/qresourceengine.pro
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qstring/qstring.pro
	tests/auto/qtcpsocket/qtcpsocket.pro
	tests/auto/qtcpsocket/tst_qtcpsocket.cpp

5 files changed, 50 insertions, 2 deletions

diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index 89d9d1b..ebdac9a 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -400,4 +400,15 @@ void QEglContext::dumpAllConfigs()
     delete [] configs;
 }
 
+QString QEglContext::extensions()
+{
+    const char* exts = eglQueryString(dpy, EGL_EXTENSIONS);
+    return QString(QLatin1String(exts));
+}
+
+bool QEglContext::hasExtension(const char* extensionName)
+{
+    return extensions().contains(QLatin1String(extensionName));
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index b457552..d2be229 100644
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -122,6 +122,9 @@ public:
 
     void dumpAllConfigs();
 
+    QString extensions();
+    bool hasExtension(const char* extensionName);
+
 private:
     QEgl::API apiType;
     EGLDisplay dpy;
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index be89efe..daaa4ba 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -125,7 +125,17 @@ void QEglProperties::setVisualFormat(const QX11Info *xinfo)
     setValue(EGL_RED_SIZE, countBits(visual->red_mask));
     setValue(EGL_GREEN_SIZE, countBits(visual->green_mask));
     setValue(EGL_BLUE_SIZE, countBits(visual->blue_mask));
-    setValue(EGL_ALPHA_SIZE, 0);    // XXX
+
+    EGLint alphaBits = 0;
+#if !defined(QT_NO_XRENDER)
+    XRenderPictFormat *format;
+    format = XRenderFindVisualFormat(xinfo->display(), visual);
+    if (format && (format->type == PictTypeDirect) && format->direct.alphaMask) {
+        alphaBits = countBits(format->direct.alphaMask);
+        qDebug("QEglProperties::setVisualFormat() - visual's alphaMask is %d", alphaBits);
+    }
+#endif
+    setValue(EGL_ALPHA_SIZE, alphaBits);
 }
 
 extern const QX11Info *qt_x11Info(const QPaintDevice *pd);
diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp
index e0ae8a6..358ebcc 100644
--- a/src/gui/egl/qeglproperties.cpp
+++ b/src/gui/egl/qeglproperties.cpp
@@ -46,12 +46,26 @@ QT_BEGIN_NAMESPACE
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
 
+#include "qegl_p.h"
+
+
 // Initialize a property block.
 QEglProperties::QEglProperties()
 {
     props.append(EGL_NONE);
 }
 
+QEglProperties::QEglProperties(EGLConfig cfg)
+{
+    props.append(EGL_NONE);
+    for (int name = 0x3020; name <= 0x304F; ++name) {
+        EGLint value;
+        if (name != EGL_NONE && eglGetConfigAttrib(QEglContext::defaultDisplay(0), cfg, name, &value))
+            setValue(name, value);
+    }
+    eglGetError();  // Clear the error state.
+}
+
 // Fetch the current value associated with a property.
 int QEglProperties::value(int name) const
 {
@@ -215,12 +229,21 @@ bool QEglProperties::reduceConfiguration()
         removeValue(EGL_SAMPLES);
         return true;
     }
-    if (removeValue(EGL_ALPHA_SIZE))
+    if (removeValue(EGL_ALPHA_SIZE)) {
+#if defined(EGL_BIND_TO_TEXTURE_RGBA) && defined(EGL_BIND_TO_TEXTURE_RGB)
+        if (removeValue(EGL_BIND_TO_TEXTURE_RGBA))
+            setValue(EGL_BIND_TO_TEXTURE_RGB, TRUE);
+#endif
         return true;
+    }
     if (removeValue(EGL_STENCIL_SIZE))
         return true;
     if (removeValue(EGL_DEPTH_SIZE))
         return true;
+#if defined(EGL_BIND_TO_TEXTURE_RGB)
+    if (removeValue(EGL_BIND_TO_TEXTURE_RGB))
+        return true;
+#endif
     return false;
 }
 
diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h
index 81af4cd..bcdc657 100644
--- a/src/gui/egl/qeglproperties_p.h
+++ b/src/gui/egl/qeglproperties_p.h
@@ -107,6 +107,7 @@ class Q_GUI_EXPORT QEglProperties
 {
 public:
     QEglProperties();
+    QEglProperties(EGLConfig);
     QEglProperties(const QEglProperties& other) : props(other.props) {}
     ~QEglProperties() {}