summaryrefslogtreecommitdiffstats
path: root/examples/wayland/minimal-cpp/window.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-01-10 21:34:39 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-01-10 21:34:39 +0100
commit8a638d510db90364cef990e770b84f372bde9f6b (patch)
treedbb3833a7e0c1011036ed43987d56b6874a70cbe /examples/wayland/minimal-cpp/window.h
parent88af49bdfe4e87d1832240a65d842e9126b7bb63 (diff)
parent1e29215b2e40a38b9324a719888749e12a74e99c (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts: .qmake.conf Change-Id: I5f8ba96b550b6d326a097fce33863caed01c05d1
Diffstat (limited to 'examples/wayland/minimal-cpp/window.h')
-rw-r--r--examples/wayland/minimal-cpp/window.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/wayland/minimal-cpp/window.h b/examples/wayland/minimal-cpp/window.h
index 1a106da9..7711e0bd 100644
--- a/examples/wayland/minimal-cpp/window.h
+++ b/examples/wayland/minimal-cpp/window.h
@@ -60,10 +60,14 @@ class Compositor;
class Window : public QOpenGLWindow
{
+ Q_OBJECT
public:
Window();
void setCompositor(Compositor *comp);
+signals:
+ void glReady();
+
protected:
void initializeGL() override;
void paintGL() override;