Merge branch 'refactor'

Conflicts:
	src/qt-compositor/compositor_api/waylandcompositor.cpp
	src/qt-compositor/wayland_wrapper/wloutput.cpp

1 files changed, 22 insertions, 0 deletions

diff --git a/examples/qwindow-compositor/qopenglwindow.h b/examples/qwindow-compositor/qopenglwindow.h
new file mode 100644
index 0000000..12ccb45
--- /dev/null
+++ b/examples/qwindow-compositor/qopenglwindow.h
@@ -0,0 +1,22 @@
+#ifndef QOPENGLWINDOW_H
+#define QOPENGLWINDOW_H
+
+#include <QWindow>
+#include <QOpenGLContext>
+#include <QSurfaceFormat>
+
+class QOpenGLWindow : public QWindow
+{
+public:
+    QOpenGLWindow(const QSurfaceFormat &format, const QRect &geometry);
+public:
+    QOpenGLContext* context() { return m_context; }
+    bool makeCurrent() { return m_context->makeCurrent(this); }
+    void swapBuffers() { m_context->swapBuffers(this); }
+
+private:
+    QOpenGLContext *m_context;
+    QSurfaceFormat m_format;
+};
+
+#endif // QOPENGLWINDOW_H