diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-20 12:26:39 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
| commit | 88f821e189bd1d4d4550c1864f622ca7df2a7c34 (patch) | |
| tree | 291fd0a8155c448ea13df57a6b1f6f7966894ed0 /src/compositor/global | |
| parent | 9c88f97492959025f7433c9a379b474095efc0dd (diff) | |
Remove automatic initialisation of extensions
It is the specific compositor application responsibillity to create the
specific extensions. Some of the extensions are picked up with the
QWaylandExtension::findIn(QWaylandExtensionContainer *) function to work
around missing events/apis. It should be a goal not to have these calles
in the base implementation of QWayland[Compositor|Surface|Input..].
Change-Id: Iacd576f2e8a79ca0165b858b1e8f44cddad48d93
Diffstat (limited to 'src/compositor/global')
| -rw-r--r-- | src/compositor/global/qwaylandextension.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/global/qwaylandextension.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/global/qwaylandextension.cpp b/src/compositor/global/qwaylandextension.cpp index e255aecc3..915d6379d 100644 --- a/src/compositor/global/qwaylandextension.cpp +++ b/src/compositor/global/qwaylandextension.cpp @@ -85,7 +85,7 @@ QWaylandExtension *QWaylandExtensionContainer::extension(const wl_interface *int return Q_NULLPTR; } -QVector<QWaylandExtension *> QWaylandExtensionContainer::extensions() const +QList<QWaylandExtension *> QWaylandExtensionContainer::extensions() const { return extension_vector; } diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandextension.h index a25667331..00523ba4d 100644 --- a/src/compositor/global/qwaylandextension.h +++ b/src/compositor/global/qwaylandextension.h @@ -57,12 +57,12 @@ public: QWaylandExtension *extension(const QByteArray &name); QWaylandExtension *extension(const wl_interface *interface); - QVector<QWaylandExtension *> extensions() const; + QList<QWaylandExtension *> extensions() const; void addExtension(QWaylandExtension *extension); void removeExtension(QWaylandExtension *extension); protected: - QVector<QWaylandExtension *> extension_vector; + QList<QWaylandExtension *> extension_vector; }; class Q_COMPOSITOR_EXPORT QWaylandExtension : public QObject |