diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-07-28 16:51:38 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-07-29 09:56:16 +0000 |
| commit | 5ce1c2a3bf9546171d2913c76330bc6d1b6a4789 (patch) | |
| tree | 22a9422680271242ec3b2b1b8b84d28088ac8dab | |
| parent | b6dff11dc9781b677c02c8308a44e85f2d919fa0 (diff) | |
Migrate to public QOpenGLTextureBlitter
Change-Id: I481ebdaf9e5749a57223a91ab3a231ca40af059a
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/wayland/minimal-cpp/window.h b/examples/wayland/minimal-cpp/window.h index c468abbbe..4df1bc833 100644 --- a/examples/wayland/minimal-cpp/window.h +++ b/examples/wayland/minimal-cpp/window.h @@ -42,7 +42,7 @@ #define WINDOW_H #include <QOpenGLWindow> -#include <QtGui/private/qopengltextureblitter_p.h> +#include <QOpenGLTextureBlitter> QT_BEGIN_NAMESPACE diff --git a/examples/wayland/qwindow-compositor/compositorwindow.h b/examples/wayland/qwindow-compositor/compositorwindow.h index 8b5180a00..3e6a02e44 100644 --- a/examples/wayland/qwindow-compositor/compositorwindow.h +++ b/examples/wayland/qwindow-compositor/compositorwindow.h @@ -43,7 +43,7 @@ #include <QOpenGLWindow> #include <QPointer> -#include <QtGui/private/qopengltextureblitter_p.h> +#include <QOpenGLTextureBlitter> QT_BEGIN_NAMESPACE diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index f5f809e9a..f92a8845b 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -80,7 +80,7 @@ #include <QtGui/private/qguiapplication_p.h> #ifdef QT_WAYLAND_COMPOSITOR_GL -# include <QtGui/private/qopengltextureblitter_p.h> +# include <QOpenGLTextureBlitter> # include <QOpenGLContext> # include <QOpenGLFramebufferObject> # include <QMatrix4x4> diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 75fe35947..ae34cddf9 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -37,7 +37,7 @@ #include <QtQml/QQmlEngine> #include <QQuickWindow> -#include <QtGui/private/qopengltextureblitter_p.h> +#include <QOpenGLTextureBlitter> #include <QOpenGLFramebufferObject> #include <QMatrix4x4> #include <QRunnable> |