diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-03-16 09:35:56 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-03-16 08:59:46 +0000 |
| commit | f60555b5ab7899e1f5069f319f9f26a24a53982d (patch) | |
| tree | 6e311307e80c2a5978df0e1ff0efa314ced6eee4 /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | 6675a612540695db5c321f49e06ebfcba297e144 (diff) | |
Add private Color singleton
This will be used by various styles.
Change-Id: I50b22c1fab04e7fd8fb1fe0b74630c721b6f8c6f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
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 |