From 4b1b46ee77ea4f45d5964d9424e729dfb4dd7f33 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 21 May 2024 13:31:29 +0200 Subject: [PATCH] Fix build with -no-feature-mdiarea Amends 96fcb4ef84bb7486221f04e53be8ee7218385178. Fixes: QTBUG-125506 Change-Id: I8d7b4396623f4420f6901c44146a0cfd2cda4e5c Reviewed-by: Doris Verria Reviewed-by: Lars Schmertmann Reviewed-by: Wladimir Leuschner (cherry picked from commit 08f6a9a522b085c53934648ea634530518305252) Reviewed-by: Qt Cherry-pick Bot --- .../styles/modernwindows/qwindows11style.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp index 28fa474e8f0..eaf30b2e0a6 100644 --- a/src/plugins/styles/modernwindows/qwindows11style.cpp +++ b/src/plugins/styles/modernwindows/qwindows11style.cpp @@ -14,7 +14,9 @@ #include #include #include +#if QT_CONFIG(mdiarea) #include +#endif #include #include @@ -2051,7 +2053,11 @@ void QWindows11Style::polish(QWidget* widget) pal.setColor(QPalette::Base, pal.window().color()); widget->setPalette(pal); } else if (const auto *scrollarea = qobject_cast(widget); - scrollarea && !qobject_cast(widget)) { + scrollarea +#if QT_CONFIG(mdiarea) + && !qobject_cast(widget) +#endif + ) { QPalette pal = scrollarea->viewport()->palette(); const QPalette originalPalette = pal; pal.setColor(scrollarea->viewport()->backgroundRole(), Qt::transparent); @@ -2070,7 +2076,11 @@ void QWindows11Style::unpolish(QWidget *widget) { QWindowsVistaStyle::unpolish(widget); if (const auto *scrollarea = qobject_cast(widget); - scrollarea && !qobject_cast(widget)) { + scrollarea +#if QT_CONFIG(mdiarea) + && !qobject_cast(widget) +#endif + ) { const QPalette pal = scrollarea->viewport()->property("_q_original_background_palette").value(); scrollarea->viewport()->setPalette(pal); scrollarea->viewport()->setProperty("_q_original_background_palette", QVariant());