diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-17 12:32:48 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-09-18 14:48:57 +0000 |
| commit | d9e0249e064bdeef545a95c64d54ac56b73833f3 (patch) | |
| tree | d3b88ebc90ead049e919d04f87a5dfa0f99e7a42 /src/compositor/compositor_api/qwaylandcompositor.h | |
| parent | 07dffc46ff14a745df020a987c2a17fbfd90d6fe (diff) | |
Simplify the construction of pure-qml
Make it possible that an WaylandOutput item is declared as a child of a
WaylandCompositor item. This is mostly usefull for examples, since
output handling will likely be event driven in a propper compositor
Change-Id: I3238b079e41a49f69cbd9255818588674b364fb2
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 2413507e9..a6b3cfee8 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -72,7 +72,7 @@ class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QObject, public QWaylandEx Q_PROPERTY(bool retainedSelection READ retainedSelectionEnabled WRITE setRetainedSelectionEnabled) Q_PROPERTY(QWaylandOutput *defaultOutput READ defaultOutput NOTIFY defaultOutputChanged) Q_PROPERTY(bool useHardwareIntegrationExtension READ useHardwareIntegrationExtension WRITE setUseHardwareIntegrationExtension NOTIFY useHardwareIntegrationExtensionChanged) - Q_PROPERTY(QWaylandInputDevice *defaultInputDevice READ defaultInputDevice CONSTANT) + Q_PROPERTY(QWaylandInputDevice *defaultInputDevice READ defaultInputDevice NOTIFY defaultInputDeviceChanged) public: QWaylandCompositor(QObject *parent = 0); @@ -123,6 +123,7 @@ Q_SIGNALS: void surfaceAboutToBeDestroyed(QWaylandSurface *surface); void defaultOutputChanged(); + void defaultInputDeviceChanged(); void useHardwareIntegrationExtensionChanged(); protected: |