diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-04 10:08:16 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-04 08:19:25 +0000 |
| commit | 4205b25129e2d6691cc5def4e2b4b6a89e9d1f1b (patch) | |
| tree | d82542f938411e98cf94592f46d4dd81a8d144b2 /src/imports | |
| parent | 298440bd118b90cba548617ccbd5178bf29ec525 (diff) | |
Improve the type registration version comments
Change-Id: I6a5f42e341f213676146bc2a9540c63d3435ffa3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 6 | ||||
| -rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 1b75636a..2394966a 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -77,9 +77,6 @@ QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlu void QtQuickControls2Plugin::registerTypes(const char *uri) { - qmlRegisterType<QQuickButtonGroup>(uri, 2, 0, "ButtonGroup"); - qmlRegisterType<QQuickButtonGroupAttached>(); - QQuickStylePrivate::init(typeUrl()); const QString style = QQuickStyle::name(); if (!style.isEmpty()) @@ -88,10 +85,13 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) QQuickStyleSelector selector; selector.setBaseUrl(typeUrl()); + // QtQuick.Controls 2.0 (Qt 5.7) qmlRegisterType(selector.select(QStringLiteral("AbstractButton.qml")), uri, 2, 0, "AbstractButton"); qmlRegisterType(selector.select(QStringLiteral("ApplicationWindow.qml")), uri, 2, 0, "ApplicationWindow"); qmlRegisterType(selector.select(QStringLiteral("BusyIndicator.qml")), uri, 2, 0, "BusyIndicator"); qmlRegisterType(selector.select(QStringLiteral("Button.qml")), uri, 2, 0, "Button"); + qmlRegisterType<QQuickButtonGroup>(uri, 2, 0, "ButtonGroup"); + qmlRegisterType<QQuickButtonGroupAttached>(); qmlRegisterType(selector.select(QStringLiteral("CheckBox.qml")), uri, 2, 0, "CheckBox"); qmlRegisterType(selector.select(QStringLiteral("CheckDelegate.qml")), uri, 2, 0, "CheckDelegate"); qmlRegisterType(selector.select(QStringLiteral("ComboBox.qml")), uri, 2, 0, "ComboBox"); diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 9a9215d9..cc344a80 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -112,6 +112,7 @@ QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent) : QQmlExtensio void QtQuickTemplates2Plugin::registerTypes(const char *uri) { + // QtQuick.Templates 2.0 (Qt 5.7) qmlRegisterType<QQuickAbstractButton>(uri, 2, 0, "AbstractButton"); qmlRegisterType<QQuickApplicationWindow>(uri, 2, 0, "ApplicationWindow"); qmlRegisterType<QQuickApplicationWindowAttached>(); @@ -177,7 +178,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterRevision<QQuickTextInput, 7>(uri, 2, 0); qmlRegisterRevision<QQuickTextEdit, 7>(uri, 2, 0); - // QtQuick.Controls 2.1 (Qt 5.8) + // QtQuick.Templates 2.1 (Qt 5.8) qmlRegisterType<QQuickButtonGroup, 1>(uri, 2, 1, "ButtonGroup"); qmlRegisterType<QQuickComboBox, 1>(uri, 2, 1, "ComboBox"); qmlRegisterType<QQuickContainer, 1>(uri, 2, 1, "Container"); |