diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-15 21:55:23 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-09-16 15:28:22 +0200 |
| commit | 11b968e392d9192ba5fe7d8251811e6dc9b22e13 (patch) | |
| tree | 6d7cb5cb10024f03a6b168ffaf4a0da6533cbca3 | |
| parent | b0d9992c3a0590e970f0bf06f3cc5b8c53314002 (diff) | |
Update dependencies on dev in qt/qtwayland
Add one moc include to make things compile after
the changes in qtbase.
The nooutput test fails with this update because
high-dpi is now enabled by default. When running
with a placeholder screen, we get a scale factor
of NaN because the default logicalDpi()
implementation divides by physical size, which
is 0x0 in the case of the placeholder. We
temporarily disable the test in order to get the
update in.
Task-number: QTBUG-86698
Change-Id: I474f6970186e93905332c679f2cec5fea459de64
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandseat.h | 1 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.h | 2 | ||||
| -rw-r--r-- | src/imports/compositor/qmldir | 2 | ||||
| -rw-r--r-- | tests/auto/client/nooutput/tst_nooutput.cpp | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index ea21c604e..6acb75103 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 239982901beaf039c25b264a9c6b63aa6fe70710 + ref: 46c1e609893b09a61d70dda3589e6b8d25261468 required: true ../qtdeclarative: - ref: 498149fc8ea7a58b355351a1697b6496e76f9a70 + ref: 6412bcd2219d2a5c1f8193d8f394ddb1279dee2b required: false diff --git a/src/compositor/compositor_api/qwaylandseat.h b/src/compositor/compositor_api/qwaylandseat.h index 60d090e9e..e77126e28 100644 --- a/src/compositor/compositor_api/qwaylandseat.h +++ b/src/compositor/compositor_api/qwaylandseat.h @@ -64,6 +64,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandSeat : public QWaylandObject #endif Q_PROPERTY(QWaylandKeymap *keymap READ keymap CONSTANT) Q_MOC_INCLUDE("qwaylandkeymap.h") + Q_MOC_INCLUDE("qwaylandview.h") QML_NAMED_ELEMENT(WaylandSeat) QML_ADDED_IN_VERSION(1, 0) diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h index 8558866b9..7fe9d3fd9 100644 --- a/src/compositor/compositor_api/qwaylandsurface.h +++ b/src/compositor/compositor_api/qwaylandsurface.h @@ -79,6 +79,8 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandSurface : public QWaylandObject Q_PROPERTY(bool hasContent READ hasContent NOTIFY hasContentChanged) Q_PROPERTY(bool cursorSurface READ isCursorSurface WRITE markAsCursorSurface NOTIFY cursorSurfaceChanged) Q_PROPERTY(bool inhibitsIdle READ inhibitsIdle NOTIFY inhibitsIdleChanged REVISION(1, 14)) + Q_MOC_INCLUDE("qwaylanddrag.h") + Q_MOC_INCLUDE("qwaylandcompositor.h") QML_NAMED_ELEMENT(WaylandSurfaceBase) QML_ADDED_IN_VERSION(1, 0) diff --git a/src/imports/compositor/qmldir b/src/imports/compositor/qmldir index ea92deec8..3e8ad1067 100644 --- a/src/imports/compositor/qmldir +++ b/src/imports/compositor/qmldir @@ -2,5 +2,5 @@ module QtWayland.Compositor plugin qwaylandcompositorplugin classname QWaylandCompositorPlugin typeinfo plugins.qmltypes -WaylandCursorItem 1.0 WaylandCursorItem.qml WaylandOutputWindow 1.0 WaylandOutputWindow.qml +WaylandCursorItem 1.0 WaylandCursorItem.qml diff --git a/tests/auto/client/nooutput/tst_nooutput.cpp b/tests/auto/client/nooutput/tst_nooutput.cpp index 098d88d99..7f491c840 100644 --- a/tests/auto/client/nooutput/tst_nooutput.cpp +++ b/tests/auto/client/nooutput/tst_nooutput.cpp @@ -56,6 +56,7 @@ private slots: void tst_nooutput::noScreens() { + QSKIP("QTBUG-86698 - Temporarily skipped for dependency update"); QRasterWindow window; window.resize(16, 16); window.show(); |