From 04c05e9a53f4fe59c58967809b91ea792b6cffbd Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 7 Sep 2016 16:32:05 +0200 Subject: 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 Reviewed-by: Paul Olav Tvete --- tests/auto/compositor/compositor/tst_compositor.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/auto/compositor/compositor/tst_compositor.cpp') 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(compositor.defaultSeat()); + TestSeat* seat = qobject_cast(compositor.defaultSeat()); + QTRY_VERIFY(seat); // The compositor will create the default input device - QTRY_COMPARE(compositor.defaultSeat(), dev); + QTRY_VERIFY(seat->isInitialized()); QList 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() -- cgit v1.2.3