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/mockoutput.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/mockoutput.h')
| -rw-r--r-- | tests/auto/client/shared/mockoutput.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/client/shared/mockoutput.h b/tests/auto/client/shared/mockoutput.h index d5a2bb56b..9f261d5d7 100644 --- a/tests/auto/client/shared/mockoutput.h +++ b/tests/auto/client/shared/mockoutput.h @@ -44,6 +44,7 @@ public: QSharedPointer<MockOutput> mockOutput() const { return m_mockOutput; } void setCurrentMode(const QSize &size); + void sendGeometryAndMode(const QRect &geometry); protected: void output_bind_resource(Resource *resource) override; |