summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaj Grönholm <kaj.gronholm@qt.io>2023-04-06 12:07:22 +0300
committerKaj Grönholm <kaj.gronholm@qt.io>2023-04-06 16:28:23 +0300
commita2dccbafcf698715456a742743a5cdea9ddc8ae3 (patch)
tree487f1a0934e0f0ccea71f1590a25557ffc8dde63
parent80095610292035a92a752fa14d3486f6a0877d43 (diff)
downloadqtbase-a2dccbafcf698715456a742743a5cdea9ddc8ae3.tar.gz
Clear invalid QApplication styleOverride
When QStyleFactory::create() is unable to find/create an override style set with QT_STYLE_OVERRIDE or "-style", clear the styleOverride. Reason for this is that Qt Quick Controls otherwise tries to use this invalid style. Task-number: QTBUG-100563 Pick-to: 6.5 Change-Id: I48fa6c211ce27d902e2eaf90c34cb5694ad7ecfd Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/widgets/kernel/qapplication.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index d5af9ac278..d155f278fa 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -527,6 +527,8 @@ void QApplicationPrivate::initialize()
qWarning("QApplication: invalid style override '%s' passed, ignoring it.\n"
"\tAvailable styles: %s", qPrintable(styleOverride),
qPrintable(QStyleFactory::keys().join(", "_L1)));
+ // Clear styleOverride so it is not picked by Qt Quick Controls (QTBUG-100563)
+ styleOverride.clear();
}
}