From 18cdd4eaa816088a77a40fb3ccf58f3ab2334606 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 1 Dec 2023 13:13:52 +0000 Subject: [PATCH] Update Qt patches to desktop-app/patches@8b95f27 --- desktop-app-patches | 2 +- qtbase.json | 6 +++--- qtwayland.json | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/desktop-app-patches b/desktop-app-patches index 92ef11b..8b95f27 160000 --- a/desktop-app-patches +++ b/desktop-app-patches @@ -1 +1 @@ -Subproject commit 92ef11b7e32a835408b484f844b88ed6a9309f89 +Subproject commit 8b95f2787ee69f3ff16a62c68b39bb8bb3d0fa68 diff --git a/qtbase.json b/qtbase.json index 635d05c..100b513 100644 --- a/qtbase.json +++ b/qtbase.json @@ -24,9 +24,9 @@ "desktop-app-patches/qtbase_6.6.1/0021-allow-bordered-translucent-macos.patch", "desktop-app-patches/qtbase_6.6.1/0022-better-open-url-linux.patch", "desktop-app-patches/qtbase_6.6.1/0023-follow-highdpi-rounding-policy-for-platform-dpr.patch", - "desktop-app-patches/qtbase_6.6.1/0024-update-window-geometry-on-scale-change.patch", - "desktop-app-patches/qtbase_6.6.1/0025-highdpi-downscale-property.patch", - "desktop-app-patches/qtbase_6.6.1/0026-highdpi-downscale-wayland.patch", + "desktop-app-patches/qtbase_6.6.1/0024-highdpi-downscale-property.patch", + "desktop-app-patches/qtbase_6.6.1/0025-highdpi-downscale-wayland.patch", + "desktop-app-patches/qtbase_6.6.1/0026-highdpi-downscale-opengl.patch", "desktop-app-patches/qtbase_6.6.1/0027-qt-patched-define.patch" ] } \ No newline at end of file diff --git a/qtwayland.json b/qtwayland.json index c782d24..0de2d28 100644 --- a/qtwayland.json +++ b/qtwayland.json @@ -2,7 +2,6 @@ "type": "patch", "paths": [ "desktop-app-patches/qtwayland_6.6.1/0001-Client-Move-topmost-grabbing-popup-tracking-to-QWayl.patch", - "desktop-app-patches/qtwayland_6.6.1/0002-force-enable-fractional-scale.patch", - "desktop-app-patches/qtwayland_6.6.1/0003-popup-reposition.patch" + "desktop-app-patches/qtwayland_6.6.1/0002-force-enable-fractional-scale.patch" ] } \ No newline at end of file