diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-30 13:46:40 +0200 |
commit | c3cc73e3087db62a8427ff569abff1a8289dae83 (patch) | |
tree | 9839a823f220f57775a732658b8aab0fa4ba9be3 /src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp | |
parent | 2e0cded94716430658d4afe3e0fdd6fe4cf6362c (diff) | |
parent | bc514fba81b67afb41ee91ea917352ad674630a5 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RangeSlider.qml
Change-Id: I0b930583135f044cb690217c026e6a120b73fcb7
Diffstat (limited to 'src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp')
-rw-r--r-- | src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp index 29f2b7cc..017a1aad 100644 --- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp +++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp @@ -92,6 +92,8 @@ void QtQuickControls2UniversalStylePlugin::initializeEngine(QQmlEngine *engine, qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle"); qmlRegisterType<QQuickUniversalBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); qmlRegisterType<QQuickUniversalProgressBar>(import, 2, 0, "ProgressBarImpl"); + + qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); } |