diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-01-12 12:57:53 +0100 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:41 +0200 |
| commit | e17588ea0e107d5d97dbd8cb8a4fae5bfc8ff1a1 (patch) | |
| tree | 883f8307ea5935754c7cb21e48c87f1bd4c030a3 /src/compositor/compositor_api/qwaylandquickcompositor.h | |
| parent | 2cead7f46e8f956b4e211d305c55dd79198b7bfb (diff) | |
Make it possible to add the default shell from qml
Change-Id: I00f01a42b98dbe76851800b87a725fcca16f824e
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickcompositor.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickcompositor.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h index b859bd8c8..b84587931 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.h +++ b/src/compositor/compositor_api/qwaylandquickcompositor.h @@ -38,13 +38,16 @@ #define QWAYLANDQUICKCOMPOSITOR_H #include <QtCompositor/qwaylandcompositor.h> +#include <QtQml/QQmlParserStatus> QT_BEGIN_NAMESPACE -class Q_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor +class Q_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor, public QQmlParserStatus { + Q_INTERFACES(QQmlParserStatus) Q_OBJECT Q_PROPERTY(bool initializeLegazyQmlNames READ initializeLegazyQmlNames WRITE setInitializeLegazyQmlNames) + Q_PROPERTY(bool exposeDefaultShell READ exposeDefaultShell WRITE setExposeDefaultShell) public: QWaylandQuickCompositor(QObject *parent = 0); void create() Q_DECL_OVERRIDE; @@ -53,14 +56,22 @@ public: bool initializeLegazyQmlNames() const; void setInitializeLegazyQmlNames(bool init); + bool exposeDefaultShell() const; + void setExposeDefaultShell(bool defaultShell); + QWaylandSurfaceView *createView(QWaylandSurface *surf) Q_DECL_OVERRIDE; QWaylandOutput *createOutput(QWindow *window, const QString &manufacturer, const QString &model) Q_DECL_OVERRIDE; QWaylandSurface *createSurface(QWaylandClient *client, quint32 id, int version) Q_DECL_OVERRIDE; +protected: + void classBegin() Q_DECL_OVERRIDE; + void componentComplete() Q_DECL_OVERRIDE; + private: bool m_initializeLegazyQmlNames; + bool m_exposeDefaultShell; }; QT_END_NAMESPACE |