diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-10-05 12:22:55 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-10-23 12:21:27 +0000 |
commit | c39f3b238acfb0eac8e6763c7d65b23f19fe68d7 (patch) | |
tree | 44c5c9d7baa9b3036e667ada8f42d2b4999f6bbf /src/compositor/compositor_api/qwaylandinput.cpp | |
parent | 907bdf61761331729fe58c6394ea97354a6a9a2f (diff) |
Rename QWaylandExtensionContainer to QWaylandObject
Change the name, and make QWaylandExtension a
subclass of QWaylandObject. This way, all extensions
can have extensions of their own, without multiply
inheriting.
Change-Id: Ie06e764412d113f7a62399caa605a48b015c7d24
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandinput.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandinput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandinput.cpp b/src/compositor/compositor_api/qwaylandinput.cpp index 6365e59b8..07987f0eb 100644 --- a/src/compositor/compositor_api/qwaylandinput.cpp +++ b/src/compositor/compositor_api/qwaylandinput.cpp @@ -144,7 +144,7 @@ QWaylandKeymap::QWaylandKeymap(const QString &layout, const QString &variant, co QWaylandInputDevice::QWaylandInputDevice(QWaylandCompositor *compositor, CapabilityFlags caps) - : QObject(*new QWaylandInputDevicePrivate(this,compositor)) + : QWaylandObject(*new QWaylandInputDevicePrivate(this,compositor)) { d_func()->setCapabilities(caps); } |