diff options
author | Thomas Senyk <thomas.senyk@pelagicore.com> | 2012-10-16 19:57:50 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@pelagicore.com> | 2012-10-16 20:11:45 +0200 |
commit | 939964974d1eff70657e97cd5131dbd50e7b12ff (patch) | |
tree | a2fe68ab845d30b8c984676d53497c1118be45b6 /src | |
parent | 66e81cbefe942c701acbd4b344eee39dee96d625 (diff) |
Changing from QQuickCanvas to QQuickWindow
Following Change Id34e2954
Change-Id: Ic0d0e860c954570408c39a8f0d9502183c624dd4
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/compositor/compositor_api/waylandsurfaceitem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compositor/compositor_api/waylandsurfaceitem.cpp b/src/compositor/compositor_api/waylandsurfaceitem.cpp index c4050f143..84a961557 100644 --- a/src/compositor/compositor_api/waylandsurfaceitem.cpp +++ b/src/compositor/compositor_api/waylandsurfaceitem.cpp @@ -52,7 +52,7 @@ #include <QtGui/QScreen> #include <QtQuick/QSGSimpleRectNode> -#include <QtQuick/QQuickCanvas> +#include <QtQuick/QQuickWindow> #include <QtCore/QMutexLocker> #include <QtCore/QMutex> @@ -186,7 +186,7 @@ void WaylandSurfaceItem::ensureProvider() { if (!m_provider) { m_provider = new WaylandSurfaceTextureProvider(); - connect(canvas(), SIGNAL(sceneGraphInvalidated()), m_provider, SLOT(invalidate()), Qt::DirectConnection); + connect(window(), SIGNAL(sceneGraphInvalidated()), m_provider, SLOT(invalidate()), Qt::DirectConnection); } } @@ -353,13 +353,13 @@ void WaylandSurfaceItem::updateTexture() QSGTexture *oldTexture = texture; if (m_surface->type() == WaylandSurface::Texture) { QOpenGLContext *context = QOpenGLContext::currentContext(); - QQuickCanvas::CreateTextureOptions opt = 0; + QQuickWindow::CreateTextureOptions opt = 0; if (useTextureAlpha()) { - opt |= QQuickCanvas::TextureHasAlphaChannel; + opt |= QQuickWindow::TextureHasAlphaChannel; } - texture = canvas()->createTextureFromId(m_surface->texture(context), m_surface->size(), opt); + texture = window()->createTextureFromId(m_surface->texture(context), m_surface->size(), opt); } else { - texture = canvas()->createTextureFromImage(m_surface->image()); + texture = window()->createTextureFromImage(m_surface->image()); } texture->bind(); delete oldTexture; |