diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2014-01-10 11:34:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-10 11:00:00 +0100 |
| commit | 09809b78e1eadfa67065bb2cc8429f8156f342f5 (patch) | |
| tree | 224fca5905e1cb5340ad39fa125d4afdef243588 /src/hardwareintegration | |
| parent | b35167dd093f3b894788cb3cacd46a749fe0ff66 (diff) | |
Make the glx backend compile again
Still needs some renaming and verification, but this makes it compile at least
Change-Id: Ifb7fc68e8705f235bf0edf2ae9bb38274b693d3c
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/hardwareintegration')
3 files changed, 11 insertions, 10 deletions
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp index 62a9b0f34..b2c0dd5d3 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp @@ -49,15 +49,14 @@ QT_BEGIN_NAMESPACE -QWaylandXCompositeGLXIntegration::QWaylandXCompositeGLXIntegration(QWaylandDisplay *waylandDisplay) - : mWaylandDisplay(waylandDisplay) +QWaylandXCompositeGLXIntegration::QWaylandXCompositeGLXIntegration() + : mWaylandDisplay(0) , mWaylandComposite(0) , mDisplay(0) , mScreen(0) , mRootWindow(0) { qDebug() << "Using XComposite-GLX"; - waylandDisplay->addRegistryListener(QWaylandXCompositeGLXIntegration::wlDisplayHandleGlobal, this); } QWaylandXCompositeGLXIntegration::~QWaylandXCompositeGLXIntegration() @@ -65,8 +64,10 @@ QWaylandXCompositeGLXIntegration::~QWaylandXCompositeGLXIntegration() XCloseDisplay(mDisplay); } -void QWaylandXCompositeGLXIntegration::initialize() +void QWaylandXCompositeGLXIntegration::initialize(QWaylandDisplay *display) { + mWaylandDisplay = display; + mWaylandDisplay->addRegistryListener(QWaylandXCompositeGLXIntegration::wlDisplayHandleGlobal, this); } QWaylandWindow * QWaylandXCompositeGLXIntegration::createEglWindow(QWindow *window) diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h index ab7cd0143..c826a7870 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDXCOMPOSITEGLXINTEGRATION_H #define QWAYLANDXCOMPOSITEGLXINTEGRATION_H -#include <QtWaylandClient/qwaylandglintegration.h> +#include <QtWaylandClient/private/qwaylandclientbufferintegration_p.h> #include <wayland-client.h> #include <QtCore/QTextStream> @@ -63,13 +63,13 @@ struct qt_xcomposite; QT_BEGIN_NAMESPACE -class QWaylandXCompositeGLXIntegration : public QWaylandGLIntegration +class QWaylandXCompositeGLXIntegration : public QWaylandClientBufferIntegration { public: - QWaylandXCompositeGLXIntegration(QWaylandDisplay * waylandDispaly); + QWaylandXCompositeGLXIntegration(); ~QWaylandXCompositeGLXIntegration(); - void initialize(); + void initialize(QWaylandDisplay *display); bool waitingForEvents() { return !mDisplay; } QWaylandWindow *createEglWindow(QWindow *window); diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h index b436cbbe6..5c649f42f 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h @@ -42,13 +42,13 @@ #ifndef QWAYLANDXCOMPOSITEGLXWINDOW_H #define QWAYLANDXCOMPOSITEGLXWINDOW_H -#include "qwaylandwindow.h" +#include <QtWaylandClient/private/qwaylandwindow_p.h> #include "qwaylandxcompositeglxintegration.h" #include "qwaylandxcompositeglxcontext.h" #include <QtCore/QWaitCondition> -#include "qwaylandbuffer.h" +#include <QtWaylandClient/private/qwaylandbuffer_p.h> QT_BEGIN_NAMESPACE |