From 0d7d2ffe4e74ea9d9f482b706cd7d725ddf53092 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 20 Jan 2016 12:44:05 +0100 Subject: Material: default primary to Indigo & accent to Pink These colors are used as an example in the Google Material Design Guidelines, and as defaults in Android Studio app templates. Change-Id: I6236e4fd388817e05e22ec0b7aadedb3fae68fa1 Task-number: QTBUG-50330 Reviewed-by: Nikita Krupenko Reviewed-by: Mitch Curtis --- src/imports/controls/material/qquickmaterialstyle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports') diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 850b77ca..c2f3eb03 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -385,8 +385,8 @@ static const QRgb colors[][14] = { }; static QQuickMaterialStyle::Theme defaultTheme = QQuickMaterialStyle::Light; -static uint defaultPrimary = QQuickMaterialStyle::BlueGrey; -static uint defaultAccent = QQuickMaterialStyle::Teal; +static uint defaultPrimary = QQuickMaterialStyle::Indigo; +static uint defaultAccent = QQuickMaterialStyle::Pink; static bool defaultPrimaryCustom = false; static bool defaultAccentCustom = false; static const QRgb backgroundColorLight = 0xFFFAFAFA; -- cgit v1.2.3