aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/qquickdefaulttheme.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/qquickdefaulttheme.cpp')
-rw-r--r--src/imports/controls/qquickdefaulttheme.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp
index f4b6f5d7..bc292c2f 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/qquickdefaulttheme.cpp
@@ -36,11 +36,14 @@
#include "qquickdefaulttheme_p.h"
+#include <QtQuickTemplates2/private/qquicktheme_p.h>
+
QT_BEGIN_NAMESPACE
-QQuickDefaultTheme::QQuickDefaultTheme()
- : QQuickTheme(QStringLiteral("Default"))
+void QQuickDefaultTheme::initialize(QQuickTheme *theme)
{
+ QPalette systemPalette;
+
systemPalette.setColor(QPalette::Base, QColor::fromRgba(0xFFFFFFFF));
systemPalette.setColor(QPalette::Disabled, QPalette::Base, QColor::fromRgba(0xFFD6D6D6));
@@ -80,13 +83,7 @@ QQuickDefaultTheme::QQuickDefaultTheme()
systemPalette.setColor(QPalette::WindowText, QColor::fromRgba(0xFF26282A));
systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgba(0xFFBDBEBF));
- systemPalette = resolvePalette(systemPalette);
-}
-
-const QPalette *QQuickDefaultTheme::palette(QPlatformTheme::Palette type) const
-{
- Q_UNUSED(type);
- return &systemPalette;
+ theme->setPalette(QQuickTheme::System, systemPalette);
}
QT_END_NAMESPACE