summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2011-10-03 16:40:01 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-03 17:25:57 +0200
commit5aaedccc437192206624102e3020cb86cf51afc7 (patch)
tree17302c286ad80f1ba0adfb3139ca480c2fd85d3b
parentab247307aff0c8b1965c67584b5318faeb6d01ef (diff)
Fix compilation on Harmattan
Improved fix from e327401743dba9112faca77fd764869709ae4367 to add the necessary includes in the header file, where the types are also needed. The same header file is also included from the xcb plugin. Change-Id: I52a891be1ecc67d49a088a4db698270a06db6b54 Reviewed-on: http://codereview.qt-project.org/5932 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/platformsupport/eglconvenience/qxlibeglintegration.cpp3
-rw-r--r--src/platformsupport/eglconvenience/qxlibeglintegration_p.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/platformsupport/eglconvenience/qxlibeglintegration.cpp b/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
index e9eb0ba0b4..aeebd35d21 100644
--- a/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
+++ b/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
@@ -39,9 +39,6 @@
**
****************************************************************************/
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
#include "qxlibeglintegration_p.h"
static int countBits(unsigned long mask)
diff --git a/src/platformsupport/eglconvenience/qxlibeglintegration_p.h b/src/platformsupport/eglconvenience/qxlibeglintegration_p.h
index cce394758d..ad77754eee 100644
--- a/src/platformsupport/eglconvenience/qxlibeglintegration_p.h
+++ b/src/platformsupport/eglconvenience/qxlibeglintegration_p.h
@@ -43,6 +43,9 @@
#define QTESTLITEEGLINTEGRATION_H
#include "qeglconvenience_p.h"
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
class QXlibEglIntegration
{