summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-06-10 10:16:18 +0200
committerJørgen Lind <jorgen.lind@nokia.com>2011-06-10 10:16:18 +0200
commitf30b8b96b8540ba7d78e9ca7f6db152b40e9b2af (patch)
tree22937b87f229354041f54032b8555e382f0b849c
parentdfd07cb247e37ded7ba9b69912b7179774b00b8e (diff)
Fix QtPlatformSupport when compiling with glx and xcb
-rw-r--r--src/plugins/platforms/xcb/qglxintegration.cpp2
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp
index 67791080d5..a47de88141 100644
--- a/src/plugins/platforms/xcb/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/qglxintegration.cpp
@@ -53,7 +53,7 @@
#include <QtGui/QGuiGLContext>
#include "qglxintegration.h"
-#include "qglxconvenience.h"
+#include <QtPlatformSupport/private/qglxconvenience_p.h>
#if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
#include <dlfcn.h>
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index e6bea81c30..86a8c75878 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -68,8 +68,8 @@
#endif
#if defined(XCB_USE_GLX)
-#include <QtPlatformSupport/private/glxintegration_p.h>
-#include <QtPlatformSupport/private/glxconvenience_p.h>
+#include "qglxintegration.h"
+#include <QtPlatformSupport/private/qglxconvenience_p.h>
#elif defined(XCB_USE_EGL)
#include <QtPlatformSupport/private/qeglplatformcontext_p.h>
#include <QtPlatformSupport/private/qeglconvenience_p.h>