aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-28 10:55:20 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-08-28 14:02:25 +0000
commitb1880194b435da6384aacf84d1a4df4c14e071ee (patch)
treeec193f013dde6ccc52e491dbf9304b4d03004f73
parent8b3c28560426664f216f315d653e932f25baa610 (diff)
Native style: set the default system palette as QQuickTheme::System palettewip/nativestyle
After introducing the new registration system in Controls, the theme palette picked up colors from the Default style. Until this is fixed, set the system palette explicitly. Task-number: QTBUG-86303 Change-Id: Ib4c90856bd5410c042160b532175a48fdaea0fbd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp b/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp
index fe9deaab..dd34d2f8 100644
--- a/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp
+++ b/src/imports/nativestyle/qtquickcontrols2nativestyleplugin.cpp
@@ -38,6 +38,8 @@
#include <QtQuickControls2/private/qquickstyleplugin_p.h>
#include <QtGui/qguiapplication.h>
+#include <QtQuickTemplates2/private/qquicktheme_p.h>
+
#include "qquicknativestyle.h"
#include "qquickcommonstyle.h"
@@ -135,6 +137,8 @@ void QtQuickControls2NativeStylePlugin::initializeEngine(QQmlEngine *engine, con
void QtQuickControls2NativeStylePlugin::registerTypes(const char *uri)
{
Q_UNUSED(uri);
+ QQuickTheme::instance()->setPalette(QQuickTheme::System, QPalette());
+ QQuickTheme::instance()->setFont(QQuickTheme::System, QFont());
}
QT_END_NAMESPACE