From b2d5cd32ca54c2797804d501cede46833d468d56 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Mon, 27 Apr 2026 17:26:02 +0200 Subject: [PATCH] tdf#130857 qt weld: Only use native print widgets if native parent Don't unconditionally use a native widget for the Calc and Math print options widgets for which support was added in commit 645a8296712f88d768c4243e9013191d281e5c53 Author: Michael Weghorn Date: Sat Feb 15 22:46:15 2025 +0100 tdf#130857 qt weld: Support "Printer Options" dialog , but only if the parent is native as well. For that, make use of the logic introduced in commit 2cd7bf146077cd598ad52f8d8cd860535f8a9e5c Author: Michael Weghorn Date: Thu May 29 15:43:15 2025 +0200 tdf#130857 qt weld: Prepare for more conditional UI file support . This avoids brokenness when using qt6 with SAL_VCL_QT_USE_WELDED_WIDGETS=1 for the "Tools" -> "Options" -> "LibreOfficeDev Calc" -> "Print" page (and Math equivalent) while still using native widgets for the dialog for which support was added in the above commit. (The "Tools" -> "Options" dialog isn't supported with native Qt widgets yet, and having a native non-toplevel Qt widget as a child for a vcl widget parent is not supported.) Change-Id: I068a68baaaf6be930c6c1438dace4c7f84f6191a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204469 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- vcl/qt5/QtInstanceBuilder.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index d5f38513fe83..7b9be0f91de3 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -176,7 +176,6 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set