From f60555b5ab7899e1f5069f319f9f26a24a53982d Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Thu, 16 Mar 2017 09:35:56 +0100
Subject: Add private Color singleton

This will be used by various styles.

Change-Id: I50b22c1fab04e7fd8fb1fe0b74630c721b6f8c6f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/imports/controls/qtquickcontrols2plugin.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')

diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 092bfe47..2cd97daa 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -36,6 +36,7 @@
 
 #include <QtCore/private/qfileselector_p.h>
 #include <QtQuickControls2/qquickstyle.h>
+#include <QtQuickControls2/private/qquickcolor_p.h>
 #include <QtQuickControls2/private/qquickiconimage_p.h>
 #include <QtQuickControls2/private/qquickplaceholdertext_p.h>
 #include <QtQuickControls2/private/qquickstyle_p.h>
@@ -162,6 +163,13 @@ static QObject *styleSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
     return new QQuickDefaultStyle;
 }
 
+static QObject *colorSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    return new QQuickColor;
+}
+
 void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(uri);
@@ -184,7 +192,7 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur
     qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator");
 
     qmlRegisterType<QQuickIconImage>(import, 2, 3, "IconImage");
-
+    qmlRegisterSingletonType<QQuickColor>(import, 2, 3, "Color", colorSingleton);
 }
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3