build build with EGL support

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index d7f6873..cf6882a 100644 (file)
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -127,16 +127,7 @@ EGLConfig QEgl::defaultConfig(int devType, API api, ConfigOptions options)
 
     EGLConfig* targetConfig = 0;
 
-    static const EGLConfig defaultVGConfigs[] = {
-        QEGL_NO_CONFIG, // 0    Window  Renderable  Translucent
-        QEGL_NO_CONFIG, // 1    Window  Renderable  Opaque
-        QEGL_NO_CONFIG, // 2    Pixmap  Renderable  Translucent
-        QEGL_NO_CONFIG, // 3    Pixmap  Renderable  Opaque
-        QEGL_NO_CONFIG, // 4    Pixmap  ReadOnly    Translucent
-        QEGL_NO_CONFIG  // 5    Pixmap  ReadOnly    Opaque
-    };
-
-    static const EGLConfig defaultGLConfigs[] = {
+    static EGLConfig defaultGLConfigs[] = {
         QEGL_NO_CONFIG, // 0    Window  Renderable  Translucent
         QEGL_NO_CONFIG, // 1    Window  Renderable  Opaque
         QEGL_NO_CONFIG, // 2    PBuffer Renderable  Translucent

diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index 35789fe..809d8a8 100644 (file)
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -55,6 +55,11 @@
 
 QT_BEGIN_INCLUDE_NAMESPACE
 
+#if defined(Q_WS_X11)
+#   include <qtextstream.h>
+#   include <qt_x11_p.h>
+#endif
+
 #ifndef QT_NO_EGL
 #if defined(QT_OPENGL_ES_2)
 #   include <GLES2/gl2.h>

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 42bff3e..a08d3e9 100644 (file)
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -707,14 +707,6 @@ QApplication::QApplication(int &argc, char **argv, Type type , int _internal)
     : QCoreApplication(*new QApplicationPrivate(argc, argv, type, _internal))
 { Q_D(QApplication); d->construct(); }
 
-#if defined(Q_WS_X11) && !defined(QT_NO_EGL)
-static int qt_matchLibraryName(dl_phdr_info *info, size_t, void *data)
-{
-    const char *name = static_cast<const char *>(data);
-    return strstr(info->dlpi_name, name) != 0;
-}
-#endif
-
 /*!
     \internal
 */

diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index bac9577..2a079b3 100644 (file)
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -40,9 +40,8 @@
 ****************************************************************************/
 
 #include "qgl.h"
-#include <qt_x11_p.h>
-#include <qpixmap_x11_p.h>
 #include <qgl_p.h>
+#include <qpixmap_x11_p.h>
 #include <qpaintengine_opengl_p.h>
 #include "qgl_egl_p.h"
 #include "qcolormap.h"