diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/wayland/spanning-screens/main.qml | 12 | ||||
| -rw-r--r-- | tests/auto/client/client/tst_client.cpp | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index aefa1e701..b1c22d3b7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.8.0 +MODULE_VERSION = 5.9.0 diff --git a/examples/wayland/spanning-screens/main.qml b/examples/wayland/spanning-screens/main.qml index 32dc11f33..ae6815c9d 100644 --- a/examples/wayland/spanning-screens/main.qml +++ b/examples/wayland/spanning-screens/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Window 2.2 +import QtQuick.Window 2.3 import QtWayland.Compositor 1.0 WaylandCompositor { @@ -55,6 +55,11 @@ WaylandCompositor { visible: true color: "#1337af" Text { text: "Top screen" } + + // Enable the following to make the output target an actual screen, + // for example when running on eglfs in a multi-display embedded system. + + // targetScreen: Qt.application.screens[0] } } @@ -68,6 +73,11 @@ WaylandCompositor { visible: true color: "#1abacc" Text { text: "Bottom screen" } + + // Enable the following to make the output target an actual screen, + // for example when running on eglfs in a multi-display embedded system. + + // targetScreen: Qt.application.screens[1] } } diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp index 74363ef5f..0749239f8 100644 --- a/tests/auto/client/client/tst_client.cpp +++ b/tests/auto/client/client/tst_client.cpp @@ -300,6 +300,7 @@ void tst_WaylandClient::touchDrag() const int id = 0; compositor->sendTouchDown(surface, QPoint(10, 10), id); + compositor->sendTouchFrame(surface); compositor->sendTouchMotion(surface, QPoint(20, 20), id); compositor->sendTouchFrame(surface); compositor->waitForStartDrag(); |