diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-20 12:44:05 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-20 15:28:42 +0000 |
| commit | 0d7d2ffe4e74ea9d9f482b706cd7d725ddf53092 (patch) | |
| tree | e83a63da9468e1fee12eccad1fe991ec3914db4d /src | |
| parent | e4334234f7d1151f7467ff9c861a2ba6b294bc14 (diff) | |
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 <krnekit@gmail.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |