Material: use QRgb instead of color names

Constructing colors from QRgb (typedef unsigned int) is an
order of magnitude faster than parsing named color strings.

The same change was applied to Universal in 87a4d34.

Change-Id: I3d44e913fe48a8fb2b7c1caf5f84e3291e60945d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 318 insertions, 318 deletions

diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 1d49341f..83a52829 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -56,365 +56,365 @@ QT_BEGIN_NAMESPACE
     \qmlattachedproperty color QtQuickControls2::Material::textColorPrimaray
 */
 
-static const QColor colors[][14] = {
+static const QRgb colors[][14] = {
     // Red
     {
-        "#FFEBEE", // Shade50
-        "#FFCDD2", // Shade100
-        "#EF9A9A", // Shade200
-        "#E57373", // Shade300
-        "#EF5350", // Shade400
-        "#F44336", // Shade500
-        "#E53935", // Shade600
-        "#D32F2F", // Shade700
-        "#C62828", // Shade800
-        "#B71C1C", // Shade900
-        "#FF8A80", // ShadeA100
-        "#FF5252", // ShadeA200
-        "#FF1744", // ShadeA400
-        "#D50000"  // ShadeA700
+        0xFFEBEE, // Shade50
+        0xFFCDD2, // Shade100
+        0xEF9A9A, // Shade200
+        0xE57373, // Shade300
+        0xEF5350, // Shade400
+        0xF44336, // Shade500
+        0xE53935, // Shade600
+        0xD32F2F, // Shade700
+        0xC62828, // Shade800
+        0xB71C1C, // Shade900
+        0xFF8A80, // ShadeA100
+        0xFF5252, // ShadeA200
+        0xFF1744, // ShadeA400
+        0xD50000  // ShadeA700
     },
     // Pink
     {
-        "#FCE4EC", // Shade50
-        "#F8BBD0", // Shade100
-        "#F48FB1", // Shade200
-        "#F06292", // Shade300
-        "#EC407A", // Shade400
-        "#E91E63", // Shade500
-        "#D81B60", // Shade600
-        "#C2185B", // Shade700
-        "#AD1457", // Shade800
-        "#880E4F", // Shade900
-        "#FF80AB", // ShadeA100
-        "#FF4081", // ShadeA200
-        "#F50057", // ShadeA400
-        "#C51162"  // ShadeA700
+        0xFCE4EC, // Shade50
+        0xF8BBD0, // Shade100
+        0xF48FB1, // Shade200
+        0xF06292, // Shade300
+        0xEC407A, // Shade400
+        0xE91E63, // Shade500
+        0xD81B60, // Shade600
+        0xC2185B, // Shade700
+        0xAD1457, // Shade800
+        0x880E4F, // Shade900
+        0xFF80AB, // ShadeA100
+        0xFF4081, // ShadeA200
+        0xF50057, // ShadeA400
+        0xC51162  // ShadeA700
     },
     // Purple
     {
-        "#F3E5F5", // Shade50
-        "#E1BEE7", // Shade100
-        "#CE93D8", // Shade200
-        "#BA68C8", // Shade300
-        "#AB47BC", // Shade400
-        "#9C27B0", // Shade500
-        "#8E24AA", // Shade600
-        "#7B1FA2", // Shade700
-        "#6A1B9A", // Shade800
-        "#4A148C", // Shade900
-        "#EA80FC", // ShadeA100
-        "#E040FB", // ShadeA200
-        "#D500F9", // ShadeA400
-        "#AA00FF"  // ShadeA700
+        0xF3E5F5, // Shade50
+        0xE1BEE7, // Shade100
+        0xCE93D8, // Shade200
+        0xBA68C8, // Shade300
+        0xAB47BC, // Shade400
+        0x9C27B0, // Shade500
+        0x8E24AA, // Shade600
+        0x7B1FA2, // Shade700
+        0x6A1B9A, // Shade800
+        0x4A148C, // Shade900
+        0xEA80FC, // ShadeA100
+        0xE040FB, // ShadeA200
+        0xD500F9, // ShadeA400
+        0xAA00FF  // ShadeA700
     },
     // DeepPurple
     {
-        "#EDE7F6", // Shade50
-        "#D1C4E9", // Shade100
-        "#B39DDB", // Shade200
-        "#9575CD", // Shade300
-        "#7E57C2", // Shade400
-        "#673AB7", // Shade500
-        "#5E35B1", // Shade600
-        "#512DA8", // Shade700
-        "#4527A0", // Shade800
-        "#311B92", // Shade900
-        "#B388FF", // ShadeA100
-        "#7C4DFF", // ShadeA200
-        "#651FFF", // ShadeA400
-        "#6200EA"  // ShadeA700
+        0xEDE7F6, // Shade50
+        0xD1C4E9, // Shade100
+        0xB39DDB, // Shade200
+        0x9575CD, // Shade300
+        0x7E57C2, // Shade400
+        0x673AB7, // Shade500
+        0x5E35B1, // Shade600
+        0x512DA8, // Shade700
+        0x4527A0, // Shade800
+        0x311B92, // Shade900
+        0xB388FF, // ShadeA100
+        0x7C4DFF, // ShadeA200
+        0x651FFF, // ShadeA400
+        0x6200EA  // ShadeA700
     },
     // Indigo
     {
-        "#E8EAF6", // Shade50
-        "#C5CAE9", // Shade100
-        "#9FA8DA", // Shade200
-        "#7986CB", // Shade300
-        "#5C6BC0", // Shade400
-        "#3F51B5", // Shade500
-        "#3949AB", // Shade600
-        "#303F9F", // Shade700
-        "#283593", // Shade800
-        "#1A237E", // Shade900
-        "#8C9EFF", // ShadeA100
-        "#536DFE", // ShadeA200
-        "#3D5AFE", // ShadeA400
-        "#304FFE"  // ShadeA700
+        0xE8EAF6, // Shade50
+        0xC5CAE9, // Shade100
+        0x9FA8DA, // Shade200
+        0x7986CB, // Shade300
+        0x5C6BC0, // Shade400
+        0x3F51B5, // Shade500
+        0x3949AB, // Shade600
+        0x303F9F, // Shade700
+        0x283593, // Shade800
+        0x1A237E, // Shade900
+        0x8C9EFF, // ShadeA100
+        0x536DFE, // ShadeA200
+        0x3D5AFE, // ShadeA400
+        0x304FFE  // ShadeA700
     },
     // Blue
     {
-        "#E3F2FD", // Shade50
-        "#BBDEFB", // Shade100
-        "#90CAF9", // Shade200
-        "#64B5F6", // Shade300
-        "#42A5F5", // Shade400
-        "#2196F3", // Shade500
-        "#1E88E5", // Shade600
-        "#1976D2", // Shade700
-        "#1565C0", // Shade800
-        "#0D47A1", // Shade900
-        "#82B1FF", // ShadeA100
-        "#448AFF", // ShadeA200
-        "#2979FF", // ShadeA400
-        "#2962FF"  // ShadeA700
+        0xE3F2FD, // Shade50
+        0xBBDEFB, // Shade100
+        0x90CAF9, // Shade200
+        0x64B5F6, // Shade300
+        0x42A5F5, // Shade400
+        0x2196F3, // Shade500
+        0x1E88E5, // Shade600
+        0x1976D2, // Shade700
+        0x1565C0, // Shade800
+        0x0D47A1, // Shade900
+        0x82B1FF, // ShadeA100
+        0x448AFF, // ShadeA200
+        0x2979FF, // ShadeA400
+        0x2962FF  // ShadeA700
     },
     // LightBlue
     {
-        "#E1F5FE", // Shade50
-        "#B3E5FC", // Shade100
-        "#81D4FA", // Shade200
-        "#4FC3F7", // Shade300
-        "#29B6F6", // Shade400
-        "#03A9F4", // Shade500
-        "#039BE5", // Shade600
-        "#0288D1", // Shade700
-        "#0277BD", // Shade800
-        "#01579B", // Shade900
-        "#80D8FF", // ShadeA100
-        "#40C4FF", // ShadeA200
-        "#00B0FF", // ShadeA400
-        "#0091EA"  // ShadeA700
+        0xE1F5FE, // Shade50
+        0xB3E5FC, // Shade100
+        0x81D4FA, // Shade200
+        0x4FC3F7, // Shade300
+        0x29B6F6, // Shade400
+        0x03A9F4, // Shade500
+        0x039BE5, // Shade600
+        0x0288D1, // Shade700
+        0x0277BD, // Shade800
+        0x01579B, // Shade900
+        0x80D8FF, // ShadeA100
+        0x40C4FF, // ShadeA200
+        0x00B0FF, // ShadeA400
+        0x0091EA  // ShadeA700
     },
     // Cyan
     {
-        "#E0F7FA", // Shade50
-        "#B2EBF2", // Shade100
-        "#80DEEA", // Shade200
-        "#4DD0E1", // Shade300
-        "#26C6DA", // Shade400
-        "#00BCD4", // Shade500
-        "#00ACC1", // Shade600
-        "#0097A7", // Shade700
-        "#00838F", // Shade800
-        "#006064", // Shade900
-        "#84FFFF", // ShadeA100
-        "#18FFFF", // ShadeA200
-        "#00E5FF", // ShadeA400
-        "#00B8D4"  // ShadeA700
+        0xE0F7FA, // Shade50
+        0xB2EBF2, // Shade100
+        0x80DEEA, // Shade200
+        0x4DD0E1, // Shade300
+        0x26C6DA, // Shade400
+        0x00BCD4, // Shade500
+        0x00ACC1, // Shade600
+        0x0097A7, // Shade700
+        0x00838F, // Shade800
+        0x006064, // Shade900
+        0x84FFFF, // ShadeA100
+        0x18FFFF, // ShadeA200
+        0x00E5FF, // ShadeA400
+        0x00B8D4  // ShadeA700
     },
     // Teal
     {
-        "#E0F2F1", // Shade50
-        "#B2DFDB", // Shade100
-        "#80CBC4", // Shade200
-        "#4DB6AC", // Shade300
-        "#26A69A", // Shade400
-        "#009688", // Shade500
-        "#00897B", // Shade600
-        "#00796B", // Shade700
-        "#00695C", // Shade800
-        "#004D40", // Shade900
-        "#A7FFEB", // ShadeA100
-        "#64FFDA", // ShadeA200
-        "#1DE9B6", // ShadeA400
-        "#00BFA5"  // ShadeA700
+        0xE0F2F1, // Shade50
+        0xB2DFDB, // Shade100
+        0x80CBC4, // Shade200
+        0x4DB6AC, // Shade300
+        0x26A69A, // Shade400
+        0x009688, // Shade500
+        0x00897B, // Shade600
+        0x00796B, // Shade700
+        0x00695C, // Shade800
+        0x004D40, // Shade900
+        0xA7FFEB, // ShadeA100
+        0x64FFDA, // ShadeA200
+        0x1DE9B6, // ShadeA400
+        0x00BFA5  // ShadeA700
     },
     // Green
     {
-        "#E8F5E9", // Shade50
-        "#C8E6C9", // Shade100
-        "#A5D6A7", // Shade200
-        "#81C784", // Shade300
-        "#66BB6A", // Shade400
-        "#4CAF50", // Shade500
-        "#43A047", // Shade600
-        "#388E3C", // Shade700
-        "#2E7D32", // Shade800
-        "#1B5E20", // Shade900
-        "#B9F6CA", // ShadeA100
-        "#69F0AE", // ShadeA200
-        "#00E676", // ShadeA400
-        "#00C853"  // ShadeA700
+        0xE8F5E9, // Shade50
+        0xC8E6C9, // Shade100
+        0xA5D6A7, // Shade200
+        0x81C784, // Shade300
+        0x66BB6A, // Shade400
+        0x4CAF50, // Shade500
+        0x43A047, // Shade600
+        0x388E3C, // Shade700
+        0x2E7D32, // Shade800
+        0x1B5E20, // Shade900
+        0xB9F6CA, // ShadeA100
+        0x69F0AE, // ShadeA200
+        0x00E676, // ShadeA400
+        0x00C853  // ShadeA700
     },
     // LightGreen
     {
-        "#F1F8E9", // Shade50
-        "#DCEDC8", // Shade100
-        "#C5E1A5", // Shade200
-        "#AED581", // Shade300
-        "#9CCC65", // Shade400
-        "#8BC34A", // Shade500
-        "#7CB342", // Shade600
-        "#689F38", // Shade700
-        "#558B2F", // Shade800
-        "#33691E", // Shade900
-        "#CCFF90", // ShadeA100
-        "#B2FF59", // ShadeA200
-        "#76FF03", // ShadeA400
-        "#64DD17"  // ShadeA700
+        0xF1F8E9, // Shade50
+        0xDCEDC8, // Shade100
+        0xC5E1A5, // Shade200
+        0xAED581, // Shade300
+        0x9CCC65, // Shade400
+        0x8BC34A, // Shade500
+        0x7CB342, // Shade600
+        0x689F38, // Shade700
+        0x558B2F, // Shade800
+        0x33691E, // Shade900
+        0xCCFF90, // ShadeA100
+        0xB2FF59, // ShadeA200
+        0x76FF03, // ShadeA400
+        0x64DD17  // ShadeA700
     },
     // Lime
     {
-        "#F9FBE7", // Shade50
-        "#F0F4C3", // Shade100
-        "#E6EE9C", // Shade200
-        "#DCE775", // Shade300
-        "#D4E157", // Shade400
-        "#CDDC39", // Shade500
-        "#C0CA33", // Shade600
-        "#AFB42B", // Shade700
-        "#9E9D24", // Shade800
-        "#827717", // Shade900
-        "#F4FF81", // ShadeA100
-        "#EEFF41", // ShadeA200
-        "#C6FF00", // ShadeA400
-        "#AEEA00"  // ShadeA700
+        0xF9FBE7, // Shade50
+        0xF0F4C3, // Shade100
+        0xE6EE9C, // Shade200
+        0xDCE775, // Shade300
+        0xD4E157, // Shade400
+        0xCDDC39, // Shade500
+        0xC0CA33, // Shade600
+        0xAFB42B, // Shade700
+        0x9E9D24, // Shade800
+        0x827717, // Shade900
+        0xF4FF81, // ShadeA100
+        0xEEFF41, // ShadeA200
+        0xC6FF00, // ShadeA400
+        0xAEEA00  // ShadeA700
     },
     // Yellow
     {
-        "#FFFDE7", // Shade50
-        "#FFF9C4", // Shade100
-        "#FFF59D", // Shade200
-        "#FFF176", // Shade300
-        "#FFEE58", // Shade400
-        "#FFEB3B", // Shade500
-        "#FDD835", // Shade600
-        "#FBC02D", // Shade700
-        "#F9A825", // Shade800
-        "#F57F17", // Shade900
-        "#FFFF8D", // ShadeA100
-        "#FFFF00", // ShadeA200
-        "#FFEA00", // ShadeA400
-        "#FFD600"  // ShadeA700
+        0xFFFDE7, // Shade50
+        0xFFF9C4, // Shade100
+        0xFFF59D, // Shade200
+        0xFFF176, // Shade300
+        0xFFEE58, // Shade400
+        0xFFEB3B, // Shade500
+        0xFDD835, // Shade600
+        0xFBC02D, // Shade700
+        0xF9A825, // Shade800
+        0xF57F17, // Shade900
+        0xFFFF8D, // ShadeA100
+        0xFFFF00, // ShadeA200
+        0xFFEA00, // ShadeA400
+        0xFFD600  // ShadeA700
     },
     // Amber
     {
-        "#FFF8E1", // Shade50
-        "#FFECB3", // Shade100
-        "#FFE082", // Shade200
-        "#FFD54F", // Shade300
-        "#FFCA28", // Shade400
-        "#FFC107", // Shade500
-        "#FFB300", // Shade600
-        "#FFA000", // Shade700
-        "#FF8F00", // Shade800
-        "#FF6F00", // Shade900
-        "#FFE57F", // ShadeA100
-        "#FFD740", // ShadeA200
-        "#FFC400", // ShadeA400
-        "#FFAB00"  // ShadeA700
+        0xFFF8E1, // Shade50
+        0xFFECB3, // Shade100
+        0xFFE082, // Shade200
+        0xFFD54F, // Shade300
+        0xFFCA28, // Shade400
+        0xFFC107, // Shade500
+        0xFFB300, // Shade600
+        0xFFA000, // Shade700
+        0xFF8F00, // Shade800
+        0xFF6F00, // Shade900
+        0xFFE57F, // ShadeA100
+        0xFFD740, // ShadeA200
+        0xFFC400, // ShadeA400
+        0xFFAB00  // ShadeA700
     },
     // Orange
     {
-        "#FFF3E0", // Shade50
-        "#FFE0B2", // Shade100
-        "#FFCC80", // Shade200
-        "#FFB74D", // Shade300
-        "#FFA726", // Shade400
-        "#FF9800", // Shade500
-        "#FB8C00", // Shade600
-        "#F57C00", // Shade700
-        "#EF6C00", // Shade800
-        "#E65100", // Shade900
-        "#FFD180", // ShadeA100
-        "#FFAB40", // ShadeA200
-        "#FF9100", // ShadeA400
-        "#FF6D00"  // ShadeA700
+        0xFFF3E0, // Shade50
+        0xFFE0B2, // Shade100
+        0xFFCC80, // Shade200
+        0xFFB74D, // Shade300
+        0xFFA726, // Shade400
+        0xFF9800, // Shade500
+        0xFB8C00, // Shade600
+        0xF57C00, // Shade700
+        0xEF6C00, // Shade800
+        0xE65100, // Shade900
+        0xFFD180, // ShadeA100
+        0xFFAB40, // ShadeA200
+        0xFF9100, // ShadeA400
+        0xFF6D00  // ShadeA700
     },
     // DeepOrange
     {
-        "#FBE9E7", // Shade50
-        "#FFCCBC", // Shade100
-        "#FFAB91", // Shade200
-        "#FF8A65", // Shade300
-        "#FF7043", // Shade400
-        "#FF5722", // Shade500
-        "#F4511E", // Shade600
-        "#E64A19", // Shade700
-        "#D84315", // Shade800
-        "#BF360C", // Shade900
-        "#FF9E80", // ShadeA100
-        "#FF6E40", // ShadeA200
-        "#FF3D00", // ShadeA400
-        "#DD2C00"  // ShadeA700
+        0xFBE9E7, // Shade50
+        0xFFCCBC, // Shade100
+        0xFFAB91, // Shade200
+        0xFF8A65, // Shade300
+        0xFF7043, // Shade400
+        0xFF5722, // Shade500
+        0xF4511E, // Shade600
+        0xE64A19, // Shade700
+        0xD84315, // Shade800
+        0xBF360C, // Shade900
+        0xFF9E80, // ShadeA100
+        0xFF6E40, // ShadeA200
+        0xFF3D00, // ShadeA400
+        0xDD2C00  // ShadeA700
     },
     // Brown
     {
-        "#EFEBE9", // Shade50
-        "#D7CCC8", // Shade100
-        "#BCAAA4", // Shade200
-        "#A1887F", // Shade300
-        "#8D6E63", // Shade400
-        "#795548", // Shade500
-        "#6D4C41", // Shade600
-        "#5D4037", // Shade700
-        "#4E342E", // Shade800
-        "#3E2723", // Shade900
-        "#000000", // ShadeA100
-        "#000000", // ShadeA200
-        "#000000", // ShadeA400
-        "#000000"  // ShadeA700
+        0xEFEBE9, // Shade50
+        0xD7CCC8, // Shade100
+        0xBCAAA4, // Shade200
+        0xA1887F, // Shade300
+        0x8D6E63, // Shade400
+        0x795548, // Shade500
+        0x6D4C41, // Shade600
+        0x5D4037, // Shade700
+        0x4E342E, // Shade800
+        0x3E2723, // Shade900
+        0x000000, // ShadeA100
+        0x000000, // ShadeA200
+        0x000000, // ShadeA400
+        0x000000  // ShadeA700
     },
     // Grey
     {
-        "#FAFAFA", // Shade50
-        "#F5F5F5", // Shade100
-        "#EEEEEE", // Shade200
-        "#E0E0E0", // Shade300
-        "#BDBDBD", // Shade400
-        "#9E9E9E", // Shade500
-        "#757575", // Shade600
-        "#616161", // Shade700
-        "#424242", // Shade800
-        "#212121", // Shade900
-        "#000000", // ShadeA100
-        "#000000", // ShadeA200
-        "#000000", // ShadeA400
-        "#000000"  // ShadeA700
+        0xFAFAFA, // Shade50
+        0xF5F5F5, // Shade100
+        0xEEEEEE, // Shade200
+        0xE0E0E0, // Shade300
+        0xBDBDBD, // Shade400
+        0x9E9E9E, // Shade500
+        0x757575, // Shade600
+        0x616161, // Shade700
+        0x424242, // Shade800
+        0x212121, // Shade900
+        0x000000, // ShadeA100
+        0x000000, // ShadeA200
+        0x000000, // ShadeA400
+        0x000000  // ShadeA700
     },
     // BlueGrey
     {
-        "#ECEFF1", // Shade50
-        "#CFD8DC", // Shade100
-        "#B0BEC5", // Shade200
-        "#90A4AE", // Shade300
-        "#78909C", // Shade400
-        "#607D8B", // Shade500
-        "#546E7A", // Shade600
-        "#455A64", // Shade700
-        "#37474F", // Shade800
-        "#263238", // Shade900
-        "#000000", // ShadeA100
-        "#000000", // ShadeA200
-        "#000000", // ShadeA400
-        "#000000"  // ShadeA700
+        0xECEFF1, // Shade50
+        0xCFD8DC, // Shade100
+        0xB0BEC5, // Shade200
+        0x90A4AE, // Shade300
+        0x78909C, // Shade400
+        0x607D8B, // Shade500
+        0x546E7A, // Shade600
+        0x455A64, // Shade700
+        0x37474F, // Shade800
+        0x263238, // Shade900
+        0x000000, // ShadeA100
+        0x000000, // ShadeA200
+        0x000000, // ShadeA400
+        0x000000  // ShadeA700
     }
 };
 
 static QQuickMaterialStyle::Theme defaultTheme = QQuickMaterialStyle::Light;
 static QQuickMaterialStyle::Color defaultPrimary = QQuickMaterialStyle::BlueGrey;
 static QQuickMaterialStyle::Color defaultAccent = QQuickMaterialStyle::Teal;
-static const QColor backgroundColorLight = "#FFFAFAFA";
-static const QColor backgroundColorDark = "#FF303030";
-static const QColor dialogColorLight = "#FFFFFFFF";
-static const QColor dialogColorDark = "#FF303030";
-static const QColor primaryTextColorLight = "#DD000000";
-static const QColor primaryTextColorDark = "#FFFFFFFF";
-static const QColor secondaryTextColorLight = "#89000000";
-static const QColor secondaryTextColorDark = "#B2FFFFFF";
-static const QColor hintTextColorLight = "#60000000";
-static const QColor hintTextColorDark = "#4CFFFFFF";
-static const QColor dividerTextColorLight = "#1E000000";
-static const QColor dividerTextColorDark = "#1EFFFFFF";
-static const QColor raisedButtonColorLight = "#FFD6D7D7";
+static const QRgb backgroundColorLight = 0xFFFAFAFA;
+static const QRgb backgroundColorDark = 0xFF303030;
+static const QRgb dialogColorLight = 0xFFFFFFFF;
+static const QRgb dialogColorDark = 0xFF303030;
+static const QRgb primaryTextColorLight = 0xDD000000;
+static const QRgb primaryTextColorDark = 0xFFFFFFFF;
+static const QRgb secondaryTextColorLight = 0x89000000;
+static const QRgb secondaryTextColorDark = 0xB2FFFFFF;
+static const QRgb hintTextColorLight = 0x60000000;
+static const QRgb hintTextColorDark = 0x4CFFFFFF;
+static const QRgb dividerTextColorLight = 0x1E000000;
+static const QRgb dividerTextColorDark = 0x1EFFFFFF;
+static const QRgb raisedButtonColorLight = 0xFFD6D7D7;
 // TODO: find out actual value
-static const QColor raisedButtonPressColorLight = "#FFCCCDCD";
-static const QColor raisedButtonDisabledColorLight = dividerTextColorLight;
-static const QColor raisedButtonDisabledColorDark = dividerTextColorDark;
-static const QColor flatButtonPressColorLight = "#66999999";
-static const QColor flatButtonPressColorDark = "#3FCCCCCC";
-static const QColor flatButtonFocusColorLight = "#33CCCCCC";
-static const QColor flatButtonFocusColorDark = "#26CCCCCC";
-static const QColor frameColorLight = hintTextColorLight;
-static const QColor frameColorDark = hintTextColorDark;
-static const QColor switchUncheckedTrackColorLight = "#42000000";
-static const QColor switchUncheckedTrackColorDark = "#4CFFFFFF";
-static const QColor switchDisabledTrackColorLight = "#1E000000";
-static const QColor switchDisabledTrackColorDark = "#19FFFFFF";
+static const QRgb raisedButtonPressColorLight = 0xFFCCCDCD;
+static const QRgb raisedButtonDisabledColorLight = dividerTextColorLight;
+static const QRgb raisedButtonDisabledColorDark = dividerTextColorDark;
+static const QRgb flatButtonPressColorLight = 0x66999999;
+static const QRgb flatButtonPressColorDark = 0x3FCCCCCC;
+static const QRgb flatButtonFocusColorLight = 0x33CCCCCC;
+static const QRgb flatButtonFocusColorDark = 0x26CCCCCC;
+static const QRgb frameColorLight = hintTextColorLight;
+static const QRgb frameColorDark = hintTextColorDark;
+static const QRgb switchUncheckedTrackColorLight = 0x42000000;
+static const QRgb switchUncheckedTrackColorDark = 0x4CFFFFFF;
+static const QRgb switchDisabledTrackColorLight = 0x1E000000;
+static const QRgb switchDisabledTrackColorDark = 0x19FFFFFF;
 // TODO: find out actual values
-static const QColor checkBoxUncheckedRippleColorLight = "#10000000";
-static const QColor checkBoxUncheckedRippleColorDark = "#20FFFFFF";
+static const QRgb checkBoxUncheckedRippleColorLight = 0x10000000;
+static const QRgb checkBoxUncheckedRippleColorDark = 0x20FFFFFF;
 
 QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickStyle(parent),
     m_explicitTheme(false),
@@ -569,27 +569,27 @@ QColor QQuickMaterialStyle::accentColor() const
 
 QColor QQuickMaterialStyle::backgroundColor() const
 {
-    return m_theme == Light ? backgroundColorLight : backgroundColorDark;
+    return QColor::fromRgba(m_theme == Light ? backgroundColorLight : backgroundColorDark);
 }
 
 QColor QQuickMaterialStyle::primaryTextColor() const
 {
-    return m_theme == Light ? primaryTextColorLight : primaryTextColorDark;
+    return QColor::fromRgba(m_theme == Light ? primaryTextColorLight : primaryTextColorDark);
 }
 
 QColor QQuickMaterialStyle::primaryHighlightedTextColor() const
 {
-    return primaryTextColorDark;
+    return QColor::fromRgba(primaryTextColorDark);
 }
 
 QColor QQuickMaterialStyle::secondaryTextColor() const
 {
-    return m_theme == Light ? secondaryTextColorLight : secondaryTextColorDark;
+    return QColor::fromRgba(m_theme == Light ? secondaryTextColorLight : secondaryTextColorDark);
 }
 
 QColor QQuickMaterialStyle::hintTextColor() const
 {
-    return m_theme == Light ? hintTextColorLight : hintTextColorDark;
+    return QColor::fromRgba(m_theme == Light ? hintTextColorLight : hintTextColorDark);
 }
 
 QColor QQuickMaterialStyle::textSelectionColor() const
@@ -601,33 +601,33 @@ QColor QQuickMaterialStyle::textSelectionColor() const
 
 QColor QQuickMaterialStyle::dropShadowColor() const
 {
-    return QColor("#40000000");
+    return QColor::fromRgba(0x40000000);
 }
 
 QColor QQuickMaterialStyle::dividerColor() const
 {
-    return m_theme == Light ? dividerTextColorLight : dividerTextColorDark;
+    return QColor::fromRgba(m_theme == Light ? dividerTextColorLight : dividerTextColorDark);
 }
 
 QColor QQuickMaterialStyle::raisedButtonColor() const
 {
-    return m_theme == Light ? raisedButtonColorLight : flatButtonFocusColorDark;
+    return QColor::fromRgba(m_theme == Light ? raisedButtonColorLight : flatButtonFocusColorDark);
 }
 
 QColor QQuickMaterialStyle::raisedButtonHoverColor() const
 {
     // The specs don't specify different colors here for the light theme.
-    return m_theme == Light ? raisedButtonColorLight : flatButtonPressColorDark;
+    return QColor::fromRgba(m_theme == Light ? raisedButtonColorLight : flatButtonPressColorDark);
 }
 
 QColor QQuickMaterialStyle::raisedButtonPressColor() const
 {
-    return m_theme == Light ? raisedButtonPressColorLight : flatButtonPressColorDark;
+    return QColor::fromRgba(m_theme == Light ? raisedButtonPressColorLight : flatButtonPressColorDark);
 }
 
 QColor QQuickMaterialStyle::raisedButtonDisabledColor() const
 {
-    return m_theme == Light ? raisedButtonDisabledColorLight : raisedButtonDisabledColorDark;
+    return QColor::fromRgba(m_theme == Light ? raisedButtonDisabledColorLight : raisedButtonDisabledColorDark);
 }
 
 QColor QQuickMaterialStyle::raisedHighlightedButtonColor() const
@@ -647,27 +647,27 @@ QColor QQuickMaterialStyle::raisedHighlightedButtonPressColor() const
 
 QColor QQuickMaterialStyle::raisedHighlightedButtonDisabledColor() const
 {
-    return m_theme == Light ? raisedButtonDisabledColorLight : raisedButtonDisabledColorDark;
+    return QColor::fromRgba(m_theme == Light ? raisedButtonDisabledColorLight : raisedButtonDisabledColorDark);
 }
 
 QColor QQuickMaterialStyle::flatButtonPressColor() const
 {
-    return m_theme == Light ? flatButtonPressColorLight : flatButtonPressColorDark;
+    return QColor::fromRgba(m_theme == Light ? flatButtonPressColorLight : flatButtonPressColorDark);
 }
 
 QColor QQuickMaterialStyle::flatButtonFocusColor() const
 {
-    return m_theme == Light ? flatButtonFocusColorLight : flatButtonFocusColorDark;
+    return QColor::fromRgba(m_theme == Light ? flatButtonFocusColorLight : flatButtonFocusColorDark);
 }
 
 QColor QQuickMaterialStyle::frameColor() const
 {
-    return m_theme == Light ? frameColorLight : frameColorDark;
+    return QColor::fromRgba(m_theme == Light ? frameColorLight : frameColorDark);
 }
 
 QColor QQuickMaterialStyle::checkBoxUncheckedRippleColor() const
 {
-    return m_theme == Light ? checkBoxUncheckedRippleColorLight : checkBoxUncheckedRippleColorDark;
+    return QColor::fromRgba(m_theme == Light ? checkBoxUncheckedRippleColorLight : checkBoxUncheckedRippleColorDark);
 }
 
 QColor QQuickMaterialStyle::checkBoxCheckedRippleColor() const
@@ -680,7 +680,7 @@ QColor QQuickMaterialStyle::checkBoxCheckedRippleColor() const
 
 QColor QQuickMaterialStyle::switchUncheckedTrackColor() const
 {
-    return m_theme == Light ? switchUncheckedTrackColorLight : switchUncheckedTrackColorDark;
+    return QColor::fromRgba(m_theme == Light ? switchUncheckedTrackColorLight : switchUncheckedTrackColorDark);
 }
 
 QColor QQuickMaterialStyle::switchCheckedTrackColor() const
@@ -702,7 +702,7 @@ QColor QQuickMaterialStyle::switchCheckedHandleColor() const
 
 QColor QQuickMaterialStyle::switchDisabledTrackColor() const
 {
-    return m_theme == Light ? switchDisabledTrackColorLight : switchDisabledTrackColorDark;
+    return QColor::fromRgba(m_theme == Light ? switchDisabledTrackColorLight : switchDisabledTrackColorDark);
 }
 
 QColor QQuickMaterialStyle::switchDisabledHandleColor() const
@@ -712,27 +712,27 @@ QColor QQuickMaterialStyle::switchDisabledHandleColor() const
 
 QColor QQuickMaterialStyle::scrollBarColor() const
 {
-    return m_theme == Light ? "#40000000" : "#40FFFFFF";
+    return QColor::fromRgba(m_theme == Light ? 0x40000000 : 0x40FFFFFF);
 }
 
 QColor QQuickMaterialStyle::scrollBarPressedColor() const
 {
-    return m_theme == Light ? "#80000000" : "#80FFFFFF";
+    return QColor::fromRgba(m_theme == Light ? 0x80000000 : 0x80FFFFFF);
 }
 
 QColor QQuickMaterialStyle::drawerBackgroundColor() const
 {
-    return dividerTextColorLight;
+    return QColor::fromRgba(dividerTextColorLight);
 }
 
 QColor QQuickMaterialStyle::dialogColor() const
 {
-    return m_theme == Light ? dialogColorLight : dialogColorDark;
+    return QColor::fromRgba(m_theme == Light ? dialogColorLight : dialogColorDark);
 }
 
 QColor QQuickMaterialStyle::backgroundDimColor() const
 {
-    return m_theme == Light ? "#99303030" : "#99fafafa";
+    return QColor::fromRgba(m_theme == Light ? 0x99303030 : 0x99fafafa);
 }
 
 QColor QQuickMaterialStyle::color(QQuickMaterialStyle::Color color, QQuickMaterialStyle::Shade shade) const