diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-09-07 16:32:05 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2016-09-30 14:21:39 +0000 |
commit | 04c05e9a53f4fe59c58967809b91ea792b6cffbd (patch) | |
tree | 280aebaeef2349da8373bf6c7e00ad84665b27fc /tests/auto/compositor | |
parent | 5372ec5c131e23cccfbabc43d700ffbbbad973ec (diff) |
Make QWaylandKeymap a QObject
This makes it possible to use defaultSeat declaratively by allowing it to be
uninitialized until the QWaylandCompositor::create has been called.
Change-Id: I962cc7cc82a0bbc9240abb50cf92dee77e4a0ba6
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests/auto/compositor')
-rw-r--r-- | tests/auto/compositor/compositor/testseat.h | 2 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/compositor/compositor/testseat.h b/tests/auto/compositor/compositor/testseat.h index 54641c07d..7fa7030fa 100644 --- a/tests/auto/compositor/compositor/testseat.h +++ b/tests/auto/compositor/compositor/testseat.h @@ -36,7 +36,7 @@ QT_END_NAMESPACE class TestSeat : public QWaylandSeat { - + Q_OBJECT public: TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps); diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 3052b7b45..16aedd8ec 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -347,20 +347,21 @@ void tst_WaylandCompositor::seatCreation() MockClient client; Q_UNUSED(client); - TestSeat* dev = static_cast<TestSeat*>(compositor.defaultSeat()); + TestSeat* seat = qobject_cast<TestSeat *>(compositor.defaultSeat()); + QTRY_VERIFY(seat); // The compositor will create the default input device - QTRY_COMPARE(compositor.defaultSeat(), dev); + QTRY_VERIFY(seat->isInitialized()); QList<QMouseEvent *> allEvents; - allEvents += dev->createMouseEvents(5); + allEvents += seat->createMouseEvents(5); foreach (QMouseEvent *me, allEvents) { compositor.seatFor(me); } // The default input device will get called exatly the number of times it has created // the events - QTRY_COMPARE(dev->queryCount(), 5); + QTRY_COMPARE(seat->queryCount(), 5); } void tst_WaylandCompositor::seatKeyboardFocus() |