diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-20 12:32:49 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-21 09:04:01 +0200 |
commit | 891a86f0f3b0664162642ee1d6aa3078f16695d1 (patch) | |
tree | 1a02176387e5f8b62d723a3c91da21b98ec9a96d | |
parent | 4581a9999e12e14bbf0836d0740191ba50109540 (diff) |
Compile fixes.
6 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h index 1a46a479e6..d9953abcc9 100644 --- a/src/gui/kernel/qplatformintegration_qpa.h +++ b/src/gui/kernel/qplatformintegration_qpa.h @@ -62,6 +62,7 @@ class QPlatformNativeInterface; class QPlatformPrinterSupport; class QPlatformDrag; class QPlatformGLContext; +class QGuiGLFormat; class Q_GUI_EXPORT QPlatformIntegration { diff --git a/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp index 8769752d5f..cd6ab188f7 100644 --- a/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp +++ b/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp @@ -41,7 +41,7 @@ #include "qwaylandreadbackeglcontext.h" -#include "../../../eglconvenience/qeglconvenience.h" +#include <QPlatformSupport/eglconvenience/qeglconvenience_p.h> #include <QtCore/QDebug> #include <QtGui/QWindowContext> diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp index c5db44da4b..c43b675d44 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp @@ -46,7 +46,7 @@ #include <QtCore/QDebug> #include <QtGui/QRegion> -#include "QtPlatformSupport/private/qeglconvenience_p.h" +#include <QtPlatformSupport/private/qeglconvenience_p.h> QWaylandXCompositeEGLSurface::QWaylandXCompositeEGLSurface(QWaylandXCompositeEGLWindow *window) : QEGLSurface(window->eglSurface(), window->window()->glFormat()) diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h index bd7039f284..e394ea1a04 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h @@ -46,7 +46,7 @@ #include "qwaylandxcompositeeglintegration.h" -#include "qeglplatformcontext.h" +#include <QtPlatformSupport/private/qeglplatformcontext_p.h> class QWaylandXCompositeEGLWindow; diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp index 5c6717eb0c..5e1bab2044 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp @@ -42,10 +42,10 @@ #include "qwaylandxcompositeeglwindow.h" #include "qwaylandxcompositebuffer.h" -#include "qeglconvenience.h" +#include <QtPlatformSupport/private/qeglconvenience_p.h> +#include <QtPlatformSupport/private/qxlibeglintegration_p.h> #include "wayland-xcomposite-client-protocol.h" -#include "qxlibeglintegration.h" #include <X11/extensions/Xcomposite.h> diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 45d9d69199..a07a5a544e 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -66,7 +66,7 @@ #if defined(XCB_USE_GLX) #include "qglxintegration.h" #elif defined(XCB_USE_EGL) -#include "../eglconvenience/qeglplatformcontext.h" +#include <QtPlatformSupport/private/qeglplatformcontext_p.h> #endif QXcbIntegration::QXcbIntegration() |