diff options
| -rw-r--r-- | examples/qml-compositor/main.cpp | 14 | ||||
| -rw-r--r-- | src/qt-compositor/compositor_api/waylandsurfaceitem.cpp | 2 | ||||
| -rw-r--r-- | src/qt-compositor/wayland_wrapper/wlsurface.cpp | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp index d1c4513..134760d 100644 --- a/examples/qml-compositor/main.cpp +++ b/examples/qml-compositor/main.cpp @@ -102,21 +102,15 @@ private slots: emit windowDestroyed(QVariant::fromValue(static_cast<QSGItem *>(item))); } - void frameSwappedSlot() { - frameFinished(); - } + void frameSwappedSlot() { + frameFinished(); + } protected: void surfaceCreated(WaylandSurface *surface) { connect(surface, SIGNAL(mapped(const QSize &)), this, SLOT(surfaceMapped(const QSize &))); } -#if 0 - void paintEvent(QPaintEvent *event) { - QSGView::paintEvent(event); - frameFinished(); - glFinish(); - } -#endif + private: QMap<QObject *, WaylandSurfaceItem *> m_windowMap; }; diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp index 34b8840..9127b93 100644 --- a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp +++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp @@ -73,6 +73,7 @@ WaylandSurfaceItem::WaylandSurfaceItem(QSGItem *parent) : QSGItem(parent) , m_surface(0) , m_texture(0) + , m_provider(0) , m_paintEnabled(true) , m_touchEventsEnabled(false) { @@ -82,6 +83,7 @@ WaylandSurfaceItem::WaylandSurfaceItem(WaylandSurface *surface, QSGItem *parent) : QSGItem(parent) , m_surface(0) , m_texture(0) + , m_provider(0) , m_paintEnabled(true) , m_touchEventsEnabled(false) { diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.cpp b/src/qt-compositor/wayland_wrapper/wlsurface.cpp index e9c4a24..c319431 100644 --- a/src/qt-compositor/wayland_wrapper/wlsurface.cpp +++ b/src/qt-compositor/wayland_wrapper/wlsurface.cpp @@ -55,7 +55,7 @@ #ifdef QT_COMPOSITOR_WAYLAND_GL #include "hardware_integration/graphicshardwareintegration.h" -#include <QtGui/QPlatformGLContext> +#include <QtGui/QPlatformOpenGLContext> #endif #ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT |