diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-08 16:53:39 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-02-21 12:38:57 +0000 |
commit | fd9fec4fc7f43fb939e8e5a946c7858390bbd9d3 (patch) | |
tree | 8d50133a7e7ccbd5ca7787836396d238151175d8 /tests/auto/client/shared/mockcompositor.h | |
parent | 3dd9c91b6ebd7f9eccecad90ac57681f6bf6c5d6 (diff) |
Fix crash when connecting a new screen
In QWaylandWindow::virtualSiblings, don't include screens that have not been
added yet. I.e. QWaylandScreens for which QPlatformIntegration::screenAdded has
not yet been called.
There are two reasons why this crash wasn't covered by the
removePrimaryScreen() test. First of all, the mock output didn't send
wl_output.done events when updating the mode/geometry. These wayland events are
what causes QWindowSystemInterface::handleScreenGeometryChange() to be called
(where virtualSiblings are called).
Furthermore, virtualSiblings is only called when the geometry actually changes,
so add a new test that changes the screen geometry of the existing screen while
a new one is being added (i.e. moves it to the right).
Task-number: QTBUG-62044
Change-Id: I623fbf8799d21c6b9293e7120ded301277639cc6
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Reviewed-by: Aleix Pol
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests/auto/client/shared/mockcompositor.h')
-rw-r--r-- | tests/auto/client/shared/mockcompositor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/client/shared/mockcompositor.h b/tests/auto/client/shared/mockcompositor.h index 9258b1926..d4cf5f367 100644 --- a/tests/auto/client/shared/mockcompositor.h +++ b/tests/auto/client/shared/mockcompositor.h @@ -89,6 +89,7 @@ public: static void setOutputMode(void *compositor, const QList<QVariant> ¶meters); static void sendAddOutput(void *data, const QList<QVariant> ¶meters); static void sendRemoveOutput(void *data, const QList<QVariant> ¶meters); + static void sendOutputGeometry(void *data, const QList<QVariant> ¶meters); static void sendSurfaceEnter(void *data, const QList<QVariant> ¶meters); static void sendSurfaceLeave(void *data, const QList<QVariant> ¶meters); @@ -181,6 +182,7 @@ public: void sendDataDeviceLeave(const QSharedPointer<MockSurface> &surface); void sendAddOutput(); void sendRemoveOutput(const QSharedPointer<MockOutput> &output); + void sendOutputGeometry(const QSharedPointer<MockOutput> &output, const QRect &geometry); void sendSurfaceEnter(const QSharedPointer<MockSurface> &surface, QSharedPointer<MockOutput> &output); void sendSurfaceLeave(const QSharedPointer<MockSurface> &surface, QSharedPointer<MockOutput> &output); void waitForStartDrag(); |