diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-16 08:51:25 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-16 08:51:25 (GMT) |
| commit | f34edb5f7f5ecddf4602727b7a981fadc1d4d4b4 (patch) | |
| tree | f0e171d6270255d50d0a225e67a4935c52c700f2 /src/plugins/platforms/xlib/qglxintegration.cpp | |
| parent | f32438ffccd8728143b93399e7cd251e72d23b55 (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | Qt-f34edb5f7f5ecddf4602727b7a981fadc1d4d4b4.zip Qt-f34edb5f7f5ecddf4602727b7a981fadc1d4d4b4.tar.gz Qt-f34edb5f7f5ecddf4602727b7a981fadc1d4d4b4.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8
Diffstat (limited to 'src/plugins/platforms/xlib/qglxintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/xlib/qglxintegration.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/platforms/xlib/qglxintegration.cpp b/src/plugins/platforms/xlib/qglxintegration.cpp index 7a0f36d..a43851c 100644 --- a/src/plugins/platforms/xlib/qglxintegration.cpp +++ b/src/plugins/platforms/xlib/qglxintegration.cpp @@ -46,15 +46,13 @@ #include "qxlibwindow.h" #include "qxlibscreen.h" #include "qxlibdisplay.h" +#include "qxlibstatic.h" #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) -#include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <GL/glx.h> -#include "qglxconvenience.h" - #include "qglxintegration.h" +#include "qglxconvenience.h" + #if defined(Q_OS_LINUX) || defined(Q_OS_BSD4) #include <dlfcn.h> #endif |