diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-05-11 13:56:06 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:32 +0200 |
commit | d49887e8495252e4fa5b632dd44bb1ba1278aa2b (patch) | |
tree | df685e3252c0bc659167770a102131e86dfeb10f /src | |
parent | 51879e4884d50c83729d4346647c436d8961881e (diff) |
Make QWaylandOutput a QWaylandExtensionContainer
Change-Id: Ic345ef89317f4ee14e2ae41e5b18c3fc3df849d5
Diffstat (limited to 'src')
-rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h index 3250aa7fe..95d964d83 100644 --- a/src/compositor/compositor_api/qwaylandoutput.h +++ b/src/compositor/compositor_api/qwaylandoutput.h @@ -38,7 +38,8 @@ #ifndef QWAYLANDOUTPUT_H #define QWAYLANDOUTPUT_H -#include <QtCompositor/qwaylandexport.h> +#include <QtCompositor/qwaylandextension.h> +#include <QtCore/QObject> #include <QObject> #include <QRect> @@ -59,7 +60,7 @@ namespace QtWayland { class Output; } -class Q_COMPOSITOR_EXPORT QWaylandOutput : public QObject +class Q_COMPOSITOR_EXPORT QWaylandOutput : public QObject, public QWaylandExtensionContainer { Q_OBJECT Q_PROPERTY(QString manufacturer READ manufacturer CONSTANT) |