diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 14:19:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 15:48:05 +0000 |
| commit | 1ef2c051ec88c5579634f05f5983694a868b8efa (patch) | |
| tree | 9a4f232072834a869ba0fb833871da357dd347b0 /src/imports/controls/material/qtquickmaterialstyleplugin.cpp | |
| parent | 6a73a4cbbfcd26c4d3a5706105782f3fcb5ebd60 (diff) | |
import Qt.labs.controls 1.0 => QtQuick.Controls 2.0
Docs, resources, .metainfo and plugins.qmltypes will be updated in
follow up commits.
Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861
Task-number: QTBUG-52549
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/material/qtquickmaterialstyleplugin.cpp')
| -rw-r--r-- | src/imports/controls/material/qtquickmaterialstyleplugin.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp index 2ae2d708..3ed38b67 100644 --- a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp @@ -48,7 +48,7 @@ static inline void initResources() { Q_INIT_RESOURCE(qtquickmaterialstyleplugin); #ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_Qt_labs_controls_material); + Q_INIT_RESOURCE(qmake_QtQuick_Controls_Material); #endif } @@ -76,7 +76,7 @@ QtQuickMaterialStylePlugin::QtQuickMaterialStylePlugin(QObject *parent) : QQuick void QtQuickMaterialStylePlugin::registerTypes(const char *uri) { - qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 1, 0, "Material", tr("Material is an attached property")); + qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 2, 0, "Material", tr("Material is an attached property")); } void QtQuickMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) @@ -84,15 +84,15 @@ void QtQuickMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char QQuickStylePlugin::initializeEngine(engine, uri); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterType<QQuickPaddedRectangle>(import, 1, 0, "PaddedRectangle"); - qmlRegisterType<QQuickMaterialProgressRing>(import, 1, 0, "ProgressRing"); - qmlRegisterType<QQuickMaterialProgressStrip>(import, 1, 0, "ProgressStrip"); - qmlRegisterType<QQuickMaterialRingAnimator>(import, 1, 0, "RingAnimator"); - qmlRegisterType<QQuickMaterialStripAnimator>(import, 1, 0, "StripAnimator"); - qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 1, 0, "CheckIndicator"); - qmlRegisterType(typeUrl(QStringLiteral("Ripple.qml")), import, 1, 0, "Ripple"); - qmlRegisterType(typeUrl(QStringLiteral("SliderHandle.qml")), import, 1, 0, "SliderHandle"); - qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 1, 0, "SwitchIndicator"); + qmlRegisterType<QQuickPaddedRectangle>(import, 2, 0, "PaddedRectangle"); + qmlRegisterType<QQuickMaterialProgressRing>(import, 2, 0, "ProgressRing"); + qmlRegisterType<QQuickMaterialProgressStrip>(import, 2, 0, "ProgressStrip"); + qmlRegisterType<QQuickMaterialRingAnimator>(import, 2, 0, "RingAnimator"); + qmlRegisterType<QQuickMaterialStripAnimator>(import, 2, 0, "StripAnimator"); + qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("Ripple.qml")), import, 2, 0, "Ripple"); + qmlRegisterType(typeUrl(QStringLiteral("SliderHandle.qml")), import, 2, 0, "SliderHandle"); + qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); } QString QtQuickMaterialStylePlugin::name() const |