From a2dccbafcf698715456a742743a5cdea9ddc8ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaj=20Gr=C3=B6nholm?= Date: Thu, 6 Apr 2023 12:07:22 +0300 Subject: [PATCH] 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 --- src/widgets/kernel/qapplication.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index d5af9ac2784..d155f278fa3 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(); } }