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/templates | |
| 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/templates')
| -rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index f4c0f348..a43d5baf 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -232,7 +232,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) #endif // QtQuick.Templates 2.2 (new types and revisions in Qt 5.9) - qmlRegisterRevision<QQuickAbstractButton, 2>(uri, 2, 2); + qmlRegisterType<QQuickAbstractButton, 2>(uri, 2, 2, "AbstractButton"); qmlRegisterType<QQuickComboBox, 2>(uri, 2, 2, "ComboBox"); qmlRegisterType<QQuickDelayButton>(uri, 2, 2, "DelayButton"); qmlRegisterType<QQuickDial, 2>(uri, 2, 2, "Dial"); |