From 4af6af6f0f4e7f236f521d810ceb722d7ee61562 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 18 Jun 2019 16:34:42 +0200 Subject: sync.profile: remove two headers Because they were checked in at 618d5093d5de082f9aaf32cca778c5eae6a8548d. Fixes: QTBUG-76439 Change-Id: I1809b1424262dfe39e6cc177eec487d9ca364337 (cherry picked from commit b90a57a66f0862d8953d0b858d4e11007172cc79) Reviewed-by: Liang Qi --- sync.profile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sync.profile b/sync.profile index 1aa935c33..ab127edbb 100644 --- a/sync.profile +++ b/sync.profile @@ -65,7 +65,6 @@ "^qwayland-server-touch-extension.h", "^qwayland-server-viewporter.h", "^qwayland-server-xdg-decoration-unstable-v1.h", - "^qwayland-server-xdg-shell-unstable-v5.h", "^qwayland-server-xdg-shell-unstable-v6.h", "^qwayland-server-xdg-shell.h", "^wayland-hardware-integration-server-protocol.h", @@ -81,7 +80,6 @@ "^wayland-wayland-server-protocol.h", "^wayland-xdg-decoration-unstable-v1-server-protocol.h", "^wayland-xdg-shell-server-protocol.h", - "^wayland-xdg-shell-unstable-v5-server-protocol.h", "^wayland-xdg-shell-unstable-v6-server-protocol.h", ], "$basedir/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1" => [ -- cgit v1.2.3 From 7e658cf26dc6e85dbe4a4216f7294dbb3a928dcc Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 13 Sep 2019 12:52:15 +0200 Subject: Don't try to inject non-existent generated headers for xdg-shell v5 We use a hand edited version for xdg-shell-v5, which is added through src/plugins/shellintegration/xdg-shell-v5/pregenerated/xdg-shell-v5.pri so we shouldn't need to add it through sync.profile. Fixes: QTBUG-78210 Change-Id: Ida60f98c950b74132bd526cf44a4bf667cdce730 Reviewed-by: Paul Olav Tvete --- sync.profile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sync.profile b/sync.profile index ab127edbb..087bfcf55 100644 --- a/sync.profile +++ b/sync.profile @@ -44,10 +44,6 @@ "^wayland-xdg-shell-client-protocol.h", "^wayland-xdg-decoration-unstable-v1-client-protocol.h", ], - "$basedir/src/plugins/shellintegration/xdg-shell-v5" => [ - "^qwayland-xdg-shell-unstable-v5.h", - "^wayland-xdg-shell-unstable-v5-client-protocol.h", - ], "$basedir/src/plugins/shellintegration/xdg-shell-v6" => [ "^qwayland-xdg-shell-unstable-v6.h", "^wayland-xdg-shell-unstable-v6-client-protocol.h", -- cgit v1.2.3 From 86a96007627cec1a4e98803029c936017549cca0 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 20 Sep 2019 10:38:34 +0200 Subject: Fix wrong target name for tst_client_fullscreenshellv1 Task-number: QTBUG-78177 Change-Id: Id44794523511241b408e79383e438e52f769d62a Reviewed-by: Pier Luigi Fiorini --- tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro b/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro index 49d19d5c3..c4006cdd8 100644 --- a/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro +++ b/tests/auto/client/fullscreenshellv1/fullscreenshellv1.pro @@ -1,4 +1,4 @@ include (../shared_old/shared_old.pri) -TARGET = tst_client_fullscreenshell1 +TARGET = tst_client_fullscreenshellv1 SOURCES += tst_fullscreenshellv1.cpp -- cgit v1.2.3 From 8f6c41e49e320de9e0921801ab87a45f6e6f9fa9 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 20 Sep 2019 13:16:27 +0200 Subject: Mock client: Add missing include for QMap Task-number: QTBUG-78177 Change-Id: I123e129f09ce8599e68be710147b07235ae9462a Reviewed-by: David Edmundson Reviewed-by: Pier Luigi Fiorini --- tests/auto/compositor/compositor/mockclient.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/compositor/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h index b537e9df1..31424cf79 100644 --- a/tests/auto/compositor/compositor/mockclient.h +++ b/tests/auto/compositor/compositor/mockclient.h @@ -35,6 +35,7 @@ #include #include #include +#include #include class MockSeat; -- cgit v1.2.3