Implement defaultPalette()

Change-Id: I4345f6a3b61476287b6161d89b752735757f3a7e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

38 files changed, 268 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp
index d324feb2..b5a8ac1c 100644
--- a/src/quicktemplates2/qquickbutton.cpp
+++ b/src/quicktemplates2/qquickbutton.cpp
@@ -122,6 +122,11 @@ QFont QQuickButton::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::PushButtonFont);
 }
 
+QPalette QQuickButton::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::ButtonPalette);
+}
+
 /*!
     \qmlproperty bool QtQuick.Controls::Button::highlighted
 
diff --git a/src/quicktemplates2/qquickbutton_p.h b/src/quicktemplates2/qquickbutton_p.h
index 93fb3c14..f1a34b10 100644
--- a/src/quicktemplates2/qquickbutton_p.h
+++ b/src/quicktemplates2/qquickbutton_p.h
@@ -81,6 +81,7 @@ protected:
     void buttonChange(ButtonChange change) override;
 
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 private:
     Q_DISABLE_COPY(QQuickButton)
diff --git a/src/quicktemplates2/qquickcheckbox.cpp b/src/quicktemplates2/qquickcheckbox.cpp
index e0c7faf1..2e0c401a 100644
--- a/src/quicktemplates2/qquickcheckbox.cpp
+++ b/src/quicktemplates2/qquickcheckbox.cpp
@@ -174,6 +174,11 @@ QFont QQuickCheckBox::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::CheckBoxFont);
 }
 
+QPalette QQuickCheckBox::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::CheckBoxPalette);
+}
+
 void QQuickCheckBox::buttonChange(ButtonChange change)
 {
     if (change == ButtonCheckedChange)
diff --git a/src/quicktemplates2/qquickcheckbox_p.h b/src/quicktemplates2/qquickcheckbox_p.h
index dfd935d3..979f096b 100644
--- a/src/quicktemplates2/qquickcheckbox_p.h
+++ b/src/quicktemplates2/qquickcheckbox_p.h
@@ -75,6 +75,7 @@ Q_SIGNALS:
 
 protected:
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
     void buttonChange(ButtonChange change) override;
     void nextCheckState() override;
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index fcf90000..3f0d359e 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -1580,6 +1580,11 @@ QFont QQuickComboBox::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::ComboMenuItemFont);
 }
 
+QPalette QQuickComboBox::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::ComboBoxPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickComboBox::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquickcombobox_p.h b/src/quicktemplates2/qquickcombobox_p.h
index 851392aa..ce9ff17e 100644
--- a/src/quicktemplates2/qquickcombobox_p.h
+++ b/src/quicktemplates2/qquickcombobox_p.h
@@ -192,6 +192,7 @@ protected:
     void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override;
 
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates2/qquickdelaybutton.cpp
index f8a495b0..6e0baf56 100644
--- a/src/quicktemplates2/qquickdelaybutton.cpp
+++ b/src/quicktemplates2/qquickdelaybutton.cpp
@@ -268,4 +268,9 @@ QFont QQuickDelayButton::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::PushButtonFont);
 }
 
+QPalette QQuickDelayButton::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::ButtonPalette);
+}
+
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquickdelaybutton_p.h b/src/quicktemplates2/qquickdelaybutton_p.h
index 5ac0885d..0927eb4a 100644
--- a/src/quicktemplates2/qquickdelaybutton_p.h
+++ b/src/quicktemplates2/qquickdelaybutton_p.h
@@ -85,6 +85,7 @@ protected:
     void nextCheckState() override;
 
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 private:
     Q_DISABLE_COPY(QQuickDelayButton)
diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp
index 09bd49f6..c227afdc 100644
--- a/src/quicktemplates2/qquickgroupbox.cpp
+++ b/src/quicktemplates2/qquickgroupbox.cpp
@@ -153,6 +153,11 @@ QFont QQuickGroupBox::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::GroupBoxTitleFont);
 }
 
+QPalette QQuickGroupBox::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::GroupBoxPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickGroupBox::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquickgroupbox_p.h b/src/quicktemplates2/qquickgroupbox_p.h
index e35db1fc..b74389e4 100644
--- a/src/quicktemplates2/qquickgroupbox_p.h
+++ b/src/quicktemplates2/qquickgroupbox_p.h
@@ -75,6 +75,7 @@ Q_SIGNALS:
 
 protected:
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
diff --git a/src/quicktemplates2/qquickitemdelegate.cpp b/src/quicktemplates2/qquickitemdelegate.cpp
index fb540a49..6eb04a46 100644
--- a/src/quicktemplates2/qquickitemdelegate.cpp
+++ b/src/quicktemplates2/qquickitemdelegate.cpp
@@ -126,6 +126,11 @@ QFont QQuickItemDelegate::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::ItemViewFont);
 }
 
+QPalette QQuickItemDelegate::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::ItemViewPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickItemDelegate::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquickitemdelegate_p.h b/src/quicktemplates2/qquickitemdelegate_p.h
index a162ddee..5d52f764 100644
--- a/src/quicktemplates2/qquickitemdelegate_p.h
+++ b/src/quicktemplates2/qquickitemdelegate_p.h
@@ -70,6 +70,7 @@ Q_SIGNALS:
 
 protected:
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index 04305cea..512d6628 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -37,6 +37,7 @@
 #include "qquickmenu_p.h"
 #include "qquickmenu_p_p.h"
 #include "qquickmenuitem_p.h"
+#include "qquickcontrol_p_p.h"
 
 #include <QtGui/qevent.h>
 #include <QtQml/private/qqmlobjectmodel_p.h>
@@ -525,6 +526,11 @@ void QQuickMenu::keyReleaseEvent(QKeyEvent *event)
         item->forceActiveFocus();
 }
 
+QPalette QQuickMenu::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::MenuPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickMenu::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h
index a899fe51..1305cf93 100644
--- a/src/quicktemplates2/qquickmenu_p.h
+++ b/src/quicktemplates2/qquickmenu_p.h
@@ -91,6 +91,8 @@ Q_SIGNALS:
     void titleChanged();
 
 protected:
+    QPalette defaultPalette() const override;
+
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
 #endif
diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp
index 0c6c80a3..8210af23 100644
--- a/src/quicktemplates2/qquickmenuitem.cpp
+++ b/src/quicktemplates2/qquickmenuitem.cpp
@@ -145,6 +145,11 @@ QFont QQuickMenuItem::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::MenuItemFont);
 }
 
+QPalette QQuickMenuItem::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::MenuPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickMenuItem::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquickmenuitem_p.h b/src/quicktemplates2/qquickmenuitem_p.h
index 76f41f9d..3a279423 100644
--- a/src/quicktemplates2/qquickmenuitem_p.h
+++ b/src/quicktemplates2/qquickmenuitem_p.h
@@ -71,6 +71,7 @@ Q_SIGNALS:
 
 protected:
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates2/qquickmenuseparator.cpp
index 366f0a27..f80cc775 100644
--- a/src/quicktemplates2/qquickmenuseparator.cpp
+++ b/src/quicktemplates2/qquickmenuseparator.cpp
@@ -35,6 +35,7 @@
 ****************************************************************************/
 
 #include "qquickmenuseparator_p.h"
+#include "qquickcontrol_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -70,6 +71,11 @@ QQuickMenuSeparator::QQuickMenuSeparator(QQuickItem *parent)
 {
 }
 
+QPalette QQuickMenuSeparator::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::MenuPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickMenuSeparator::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquickmenuseparator_p.h b/src/quicktemplates2/qquickmenuseparator_p.h
index 42147f77..002b68ba 100644
--- a/src/quicktemplates2/qquickmenuseparator_p.h
+++ b/src/quicktemplates2/qquickmenuseparator_p.h
@@ -60,6 +60,8 @@ public:
     explicit QQuickMenuSeparator(QQuickItem *parent = nullptr);
 
 protected:
+    QPalette defaultPalette() const override;
+
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
 #endif
diff --git a/src/quicktemplates2/qquickradiobutton.cpp b/src/quicktemplates2/qquickradiobutton.cpp
index c923fbbf..86be3ed6 100644
--- a/src/quicktemplates2/qquickradiobutton.cpp
+++ b/src/quicktemplates2/qquickradiobutton.cpp
@@ -102,6 +102,11 @@ QFont QQuickRadioButton::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::RadioButtonFont);
 }
 
+QPalette QQuickRadioButton::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::RadioButtonPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickRadioButton::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquickradiobutton_p.h b/src/quicktemplates2/qquickradiobutton_p.h
index 0fe4eb70..ea372687 100644
--- a/src/quicktemplates2/qquickradiobutton_p.h
+++ b/src/quicktemplates2/qquickradiobutton_p.h
@@ -61,6 +61,7 @@ public:
 
 protected:
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index d0a69c2a..d6ad106a 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -914,6 +914,11 @@ QFont QQuickSpinBox::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::EditorFont);
 }
 
+QPalette QQuickSpinBox::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::TextLineEditPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickSpinBox::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h
index b5986a2a..13ba89a9 100644
--- a/src/quicktemplates2/qquickspinbox_p.h
+++ b/src/quicktemplates2/qquickspinbox_p.h
@@ -148,6 +148,7 @@ protected:
     void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) override;
 
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
diff --git a/src/quicktemplates2/qquickswitch.cpp b/src/quicktemplates2/qquickswitch.cpp
index ece9802d..ae447de8 100644
--- a/src/quicktemplates2/qquickswitch.cpp
+++ b/src/quicktemplates2/qquickswitch.cpp
@@ -229,4 +229,10 @@ void QQuickSwitch::buttonChange(ButtonChange change)
         QQuickAbstractButton::buttonChange(change);
 }
 
+QPalette QQuickSwitch::defaultPalette() const
+{
+    // ### TODO: add QPlatformTheme::SwitchPalette
+    return QQuickControlPrivate::themePalette(QPlatformTheme::CheckBoxPalette);
+}
+
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquickswitch_p.h b/src/quicktemplates2/qquickswitch_p.h
index 5b93cd32..ebcfea53 100644
--- a/src/quicktemplates2/qquickswitch_p.h
+++ b/src/quicktemplates2/qquickswitch_p.h
@@ -81,6 +81,8 @@ protected:
     void nextCheckState() override;
     void buttonChange(ButtonChange change) override;
 
+    QPalette defaultPalette() const override;
+
 private:
     Q_DISABLE_COPY(QQuickSwitch)
     Q_DECLARE_PRIVATE(QQuickSwitch)
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index 2f025dcf..f6c65d2d 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -439,6 +439,11 @@ void QQuickTabBar::itemRemoved(int index, QQuickItem *item)
         polish();
 }
 
+QPalette QQuickTabBar::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::TabBarPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickTabBar::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquicktabbar_p.h b/src/quicktemplates2/qquicktabbar_p.h
index e1016c06..0e4a3c58 100644
--- a/src/quicktemplates2/qquicktabbar_p.h
+++ b/src/quicktemplates2/qquicktabbar_p.h
@@ -99,6 +99,8 @@ protected:
     void itemMoved(int index, QQuickItem *item) override;
     void itemRemoved(int index, QQuickItem *item) override;
 
+    QPalette defaultPalette() const override;
+
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
 #endif
diff --git a/src/quicktemplates2/qquicktabbutton.cpp b/src/quicktemplates2/qquicktabbutton.cpp
index 9afe5363..617d4aea 100644
--- a/src/quicktemplates2/qquicktabbutton.cpp
+++ b/src/quicktemplates2/qquicktabbutton.cpp
@@ -75,6 +75,11 @@ QFont QQuickTabButton::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::TabButtonFont);
 }
 
+QPalette QQuickTabButton::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::TabBarPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickTabButton::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquicktabbutton_p.h b/src/quicktemplates2/qquicktabbutton_p.h
index 49ecee50..9ca9df9f 100644
--- a/src/quicktemplates2/qquicktabbutton_p.h
+++ b/src/quicktemplates2/qquicktabbutton_p.h
@@ -61,6 +61,7 @@ public:
 
 protected:
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp
index 9f5f210e..99775c6a 100644
--- a/src/quicktemplates2/qquicktoolbar.cpp
+++ b/src/quicktemplates2/qquicktoolbar.cpp
@@ -141,6 +141,11 @@ void QQuickToolBar::setPosition(Position position)
     emit positionChanged();
 }
 
+QPalette QQuickToolBar::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::ToolButtonPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickToolBar::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquicktoolbar_p.h b/src/quicktemplates2/qquicktoolbar_p.h
index 58192ff9..b919c615 100644
--- a/src/quicktemplates2/qquicktoolbar_p.h
+++ b/src/quicktemplates2/qquicktoolbar_p.h
@@ -75,6 +75,8 @@ Q_SIGNALS:
     void positionChanged();
 
 protected:
+    QPalette defaultPalette() const override;
+
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
 #endif
diff --git a/src/quicktemplates2/qquicktoolbutton.cpp b/src/quicktemplates2/qquicktoolbutton.cpp
index 3db22022..8c9e9bca 100644
--- a/src/quicktemplates2/qquicktoolbutton.cpp
+++ b/src/quicktemplates2/qquicktoolbutton.cpp
@@ -75,4 +75,9 @@ QFont QQuickToolButton::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::ToolButtonFont);
 }
 
+QPalette QQuickToolButton::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::ToolButtonPalette);
+}
+
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquicktoolbutton_p.h b/src/quicktemplates2/qquicktoolbutton_p.h
index 06745cd9..0e376f7b 100644
--- a/src/quicktemplates2/qquicktoolbutton_p.h
+++ b/src/quicktemplates2/qquicktoolbutton_p.h
@@ -61,6 +61,7 @@ public:
 
 protected:
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquicktoolseparator.cpp b/src/quicktemplates2/qquicktoolseparator.cpp
index 4da63907..2ec7799f 100644
--- a/src/quicktemplates2/qquicktoolseparator.cpp
+++ b/src/quicktemplates2/qquicktoolseparator.cpp
@@ -133,6 +133,11 @@ bool QQuickToolSeparator::isVertical() const
     return d->orientation == Qt::Vertical;
 }
 
+QPalette QQuickToolSeparator::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::ToolButtonPalette);
+}
+
 #if QT_CONFIG(accessibility)
 QAccessible::Role QQuickToolSeparator::accessibleRole() const
 {
diff --git a/src/quicktemplates2/qquicktoolseparator_p.h b/src/quicktemplates2/qquicktoolseparator_p.h
index 055f475c..2108cc5b 100644
--- a/src/quicktemplates2/qquicktoolseparator_p.h
+++ b/src/quicktemplates2/qquicktoolseparator_p.h
@@ -74,6 +74,8 @@ Q_SIGNALS:
     void orientationChanged();
 
 protected:
+    QPalette defaultPalette() const override;
+
 #if QT_CONFIG(accessibility)
     QAccessible::Role accessibleRole() const override;
 #endif
diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp
index 47aacea1..1aeb9914 100644
--- a/src/quicktemplates2/qquicktooltip.cpp
+++ b/src/quicktemplates2/qquicktooltip.cpp
@@ -279,6 +279,11 @@ QFont QQuickToolTip::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::TipLabelFont);
 }
 
+QPalette QQuickToolTip::defaultPalette() const
+{
+    return QQuickControlPrivate::themePalette(QPlatformTheme::ToolTipPalette);
+}
+
 void QQuickToolTip::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
 {
     Q_D(QQuickToolTip);
diff --git a/src/quicktemplates2/qquicktooltip_p.h b/src/quicktemplates2/qquicktooltip_p.h
index bdfbe362..60b02502 100644
--- a/src/quicktemplates2/qquicktooltip_p.h
+++ b/src/quicktemplates2/qquicktooltip_p.h
@@ -86,6 +86,7 @@ Q_SIGNALS:
 
 protected:
     QFont defaultFont() const override;
+    QPalette defaultPalette() const override;
 
     void itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) override;
     void timerEvent(QTimerEvent *event) override;
diff --git a/tests/auto/palette/palette.pro b/tests/auto/palette/palette.pro
index d683166a..36e7601c 100644
--- a/tests/auto/palette/palette.pro
+++ b/tests/auto/palette/palette.pro
@@ -4,7 +4,7 @@ SOURCES += tst_palette.cpp
 
 macos:CONFIG -= app_bundle
 
-QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private
+QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private quickcontrols2-private
 
 include (../shared/util.pri)
 
diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/palette/tst_palette.cpp
index b372c3dc..2a99ae71 100644
--- a/tests/auto/palette/tst_palette.cpp
+++ b/tests/auto/palette/tst_palette.cpp
@@ -38,11 +38,14 @@
 #include "../shared/visualtestutil.h"
 
 #include <QtGui/qpalette.h>
+#include <QtGui/qpa/qplatformtheme.h>
+#include <QtGui/private/qguiapplication_p.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
 #include <QtQuickTemplates2/private/qquickcontrol_p.h>
 #include <QtQuickTemplates2/private/qquickpopup_p.h>
+#include <QtQuickControls2/private/qquickproxytheme_p.h>
 
 using namespace QQuickVisualTestUtil;
 
@@ -56,6 +59,9 @@ private slots:
 
     void inheritance_data();
     void inheritance();
+
+    void defaultPalette_data();
+    void defaultPalette();
 };
 
 void tst_palette::palette_data()
@@ -177,6 +183,150 @@ void tst_palette::inheritance()
     QCOMPARE(grandChild->property("palette").value<QPalette>(), windowPalette);
 }
 
+class TestTheme :  public QQuickProxyTheme
+{
+public:
+    TestTheme(QPlatformTheme *theme) : QQuickProxyTheme(theme)
+    {
+        std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0));
+
+        QPalette palette = QPalette();
+        palette.setColor(QPalette::Window, Qt::gray);
+        palettes[QPlatformTheme::SystemPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::ToolTipBase, Qt::yellow);
+        palettes[QPlatformTheme::ToolTipPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::ButtonText, Qt::blue);
+        palettes[QPlatformTheme::ToolButtonPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::Button, Qt::red);
+        palettes[QPlatformTheme::ButtonPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::Text, Qt::green);
+        palettes[QPlatformTheme::CheckBoxPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::Text, Qt::blue);
+        palettes[QPlatformTheme::RadioButtonPalette] = new QPalette(palette);
+
+        // HeaderPalette unused
+
+        palette.setColor(QPalette::Base, Qt::darkGray);
+        palettes[QPlatformTheme::ComboBoxPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::Base, Qt::lightGray);
+        palettes[QPlatformTheme::ItemViewPalette] = new QPalette(palette);
+
+        // MessageBoxLabelPalette unused
+
+        palette.setColor(QPalette::ButtonText, Qt::white);
+        palettes[QPlatformTheme::TabBarPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::WindowText, Qt::darkGray);
+        palettes[QPlatformTheme::LabelPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::Mid, Qt::gray);
+        palettes[QPlatformTheme::GroupBoxPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::Shadow, Qt::darkYellow);
+        palettes[QPlatformTheme::MenuPalette] = new QPalette(palette);
+
+        // MenuBarPalette unused
+
+        palette.setColor(QPalette::Base, Qt::cyan);
+        palettes[QPlatformTheme::TextEditPalette] = new QPalette(palette);
+
+        palette.setColor(QPalette::Base, Qt::magenta);
+        palettes[QPlatformTheme::TextLineEditPalette] = new QPalette(palette);
+
+        QGuiApplicationPrivate::platform_theme = this;
+    }
+
+    const QPalette *palette(Palette type = SystemPalette) const override
+    {
+        return palettes[type];
+    }
+
+private:
+    QPalette *palettes[QPlatformTheme::NPalettes];
+};
+
+Q_DECLARE_METATYPE(QPlatformTheme::Palette)
+
+void tst_palette::defaultPalette_data()
+{
+    QTest::addColumn<QString>("control");
+    QTest::addColumn<QPlatformTheme::Palette>("paletteType");
+
+    QTest::newRow("AbstractButton") << "AbstractButton" << QPlatformTheme::SystemPalette;
+    QTest::newRow("ApplicationWindow") << "ApplicationWindow" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Button") << "Button" << QPlatformTheme::ButtonPalette;
+    QTest::newRow("CheckBox") << "CheckBox" << QPlatformTheme::CheckBoxPalette;
+    QTest::newRow("CheckDelegate") << "CheckDelegate" << QPlatformTheme::ItemViewPalette;
+    QTest::newRow("ComboBox") << "ComboBox" << QPlatformTheme::ComboBoxPalette;
+    QTest::newRow("Container") << "Container" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Control") << "Control" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Dial") << "Dial" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Dialog") << "Dialog" << QPlatformTheme::SystemPalette;
+    QTest::newRow("DialogButtonBox") << "DialogButtonBox" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Drawer") << "Drawer" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Frame") << "Frame" << QPlatformTheme::SystemPalette;
+    QTest::newRow("GroupBox") << "GroupBox" << QPlatformTheme::GroupBoxPalette;
+    QTest::newRow("ItemDelegate") << "ItemDelegate" << QPlatformTheme::ItemViewPalette;
+    QTest::newRow("Label") << "Label" << QPlatformTheme::LabelPalette;
+    QTest::newRow("Menu") << "Menu" << QPlatformTheme::MenuPalette;
+    QTest::newRow("MenuItem") << "MenuItem" << QPlatformTheme::MenuPalette;
+    QTest::newRow("MenuSeparator") << "MenuSeparator" << QPlatformTheme::MenuPalette;
+    QTest::newRow("Page") << "Page" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Pane") << "Pane" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Popup") << "Popup" << QPlatformTheme::SystemPalette;
+    QTest::newRow("ProgressBar") << "ProgressBar" << QPlatformTheme::SystemPalette;
+    QTest::newRow("RadioButton") << "RadioButton" << QPlatformTheme::RadioButtonPalette;
+    QTest::newRow("RadioDelegate") << "RadioDelegate" << QPlatformTheme::ItemViewPalette;
+    QTest::newRow("RangeSlider") << "RangeSlider" << QPlatformTheme::SystemPalette;
+    QTest::newRow("RoundButton") << "RoundButton" << QPlatformTheme::ButtonPalette;
+    QTest::newRow("ScrollBar") << "ScrollBar" << QPlatformTheme::SystemPalette;
+    QTest::newRow("ScrollIndicator") << "ScrollIndicator" << QPlatformTheme::SystemPalette;
+    QTest::newRow("Slider") << "Slider" << QPlatformTheme::SystemPalette;
+    QTest::newRow("SpinBox") << "SpinBox" << QPlatformTheme::TextLineEditPalette;
+    QTest::newRow("SwipeDelegate") << "SwipeDelegate" << QPlatformTheme::ItemViewPalette;
+    QTest::newRow("Switch") << "Switch" << QPlatformTheme::CheckBoxPalette; // ### TODO: add QPlatformTheme::SwitchPalette
+    QTest::newRow("SwitchDelegate") << "SwitchDelegate" << QPlatformTheme::ItemViewPalette;
+    QTest::newRow("TabBar") << "TabBar" << QPlatformTheme::TabBarPalette;
+    QTest::newRow("TabButton") << "TabButton" << QPlatformTheme::TabBarPalette;
+    QTest::newRow("TextArea") << "TextArea" << QPlatformTheme::TextEditPalette;
+    QTest::newRow("TextField") << "TextField" << QPlatformTheme::TextLineEditPalette;
+    QTest::newRow("ToolBar") << "ToolBar" << QPlatformTheme::ToolButtonPalette;
+    QTest::newRow("ToolButton") << "ToolButton" << QPlatformTheme::ToolButtonPalette;
+    QTest::newRow("ToolSeparator") << "ToolSeparator" << QPlatformTheme::ToolButtonPalette;
+    QTest::newRow("ToolTip") << "ToolTip" << QPlatformTheme::ToolTipPalette;
+    QTest::newRow("Tumbler") << "Tumbler" << QPlatformTheme::SystemPalette;
+}
+
+void tst_palette::defaultPalette()
+{
+    QFETCH(QString, control);
+    QFETCH(QPlatformTheme::Palette, paletteType);
+
+    TestTheme theme(QGuiApplicationPrivate::platform_theme);
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData(QString("import QtQuick.Controls 2.3; %1 { }").arg(control).toUtf8(), QUrl());
+
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY2(!object.isNull(), qPrintable(component.errorString()));
+
+    QVariant var = object->property("palette");
+    QVERIFY(var.isValid());
+
+    const QPalette *expectedPalette = theme.palette(paletteType);
+    QVERIFY(expectedPalette);
+
+    QPalette actualPalette = var.value<QPalette>();
+    QCOMPARE(actualPalette, *expectedPalette);
+}
+
 QTEST_MAIN(tst_palette)
 
 #include "tst_palette.moc"