1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with -no-feature-mdiarea

Browse Source 
Amends 96fcb4ef84bb7486221f04e53be8ee7218385178.

Fixes: QTBUG-125506
Change-Id: I8d7b4396623f4420f6901c44146a0cfd2cda4e5c
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de>
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
(cherry picked from commit 08f6a9a522b085c53934648ea634530518305252)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2024-05-21 13:31:29 +02:00 committed by Qt Cherry-pick Bot
parent 4d4aa3078f
commit 4b1b46ee77
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/styles/modernwindows/qwindows11style.cpp
View File

@ -14,7 +14,9 @@
#include <QtWidgets/qgraphicsview.h>
#include <QtWidgets/qlistview.h>
#include <QtWidgets/qmenu.h>
#if QT_CONFIG(mdiarea)
#include <QtWidgets/qmdiarea.h>
#endif
#include <QtWidgets/qtextedit.h>
#include <QtWidgets/qtreeview.h>
@ -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<QAbstractScrollArea *>(widget);
scrollarea && !qobject_cast<QMdiArea *>(widget)) {
scrollarea
#if QT_CONFIG(mdiarea)
&& !qobject_cast<QMdiArea *>(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<QAbstractScrollArea *>(widget);
scrollarea && !qobject_cast<QMdiArea *>(widget)) {
scrollarea
#if QT_CONFIG(mdiarea)
&& !qobject_cast<QMdiArea *>(widget)
#endif
) {
const QPalette pal = scrollarea->viewport()->property("_q_original_background_palette").value<QPalette>();
scrollarea->viewport()->setPalette(pal);
scrollarea->viewport()->setProperty("_q_original_background_palette", QVariant());