diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-07 19:10:18 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-08 13:38:53 +0000 |
| commit | ad2193f66b942d138c183992af2ec76fc66aa7a5 (patch) | |
| tree | 8040876e6195fddfc3e8b8a610e674ebe4850f0f /src/imports | |
| parent | 14b41264a1c3770e98d2ff075ba8bbe6cda2f841 (diff) | |
Material style: hide implementation details
Change-Id: Ib797d34014c5faddc05e93f6fc5c4f95c5664997
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/material/BusyIndicator.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/material/qtlabsmaterialstyleplugin.cpp | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index 6d5e4e8d..9eb48613 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import Qt.labs.templates 1.0 as T import Qt.labs.controls.material 1.0 +import Qt.labs.controls.material.impl 1.0 T.BusyIndicator { id: control diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp index db8b47ee..975e5db6 100644 --- a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp +++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp @@ -76,8 +76,6 @@ QtLabsMaterialStylePlugin::~QtLabsMaterialStylePlugin() void QtLabsMaterialStylePlugin::registerTypes(const char *uri) { qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 1, 0, "Material", tr("Material is an attached property")); - qmlRegisterType<QQuickMaterialProgressRing>(uri, 1, 0, "ProgressRing"); - qmlRegisterType<QQuickMaterialRingAnimator>(uri, 1, 0, "RingAnimator"); } void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) @@ -97,6 +95,10 @@ void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char } initResources(); + + QByteArray import = QByteArray(uri) + ".impl"; + qmlRegisterType<QQuickMaterialProgressRing>(import, 1, 0, "ProgressRing"); + qmlRegisterType<QQuickMaterialRingAnimator>(import, 1, 0, "RingAnimator"); } QT_END_NAMESPACE |