From 1ef2c051ec88c5579634f05f5983694a868b8efa Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 21 Apr 2016 14:19:23 +0200 Subject: 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 --- .../material/qtquickmaterialstyleplugin.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/imports/controls/material/qtquickmaterialstyleplugin.cpp') 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(uri, 1, 0, "Material", tr("Material is an attached property")); + qmlRegisterUncreatableType(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(import, 1, 0, "PaddedRectangle"); - qmlRegisterType(import, 1, 0, "ProgressRing"); - qmlRegisterType(import, 1, 0, "ProgressStrip"); - qmlRegisterType(import, 1, 0, "RingAnimator"); - qmlRegisterType(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(import, 2, 0, "PaddedRectangle"); + qmlRegisterType(import, 2, 0, "ProgressRing"); + qmlRegisterType(import, 2, 0, "ProgressStrip"); + qmlRegisterType(import, 2, 0, "RingAnimator"); + qmlRegisterType(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 -- cgit v1.2.3