diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-25 21:21:53 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-25 21:27:02 +0200 |
commit | eb9bde6d803b1b46ff3bd63fd1a6b40758cd7f4f (patch) | |
tree | 267db1fcbd31d5d2b0202b1dc4463037ff9227aa /src/imports/templates | |
parent | 1d8bf6d1f4ef0aa84ca7e4c1233bedeee0f606f9 (diff) | |
parent | 791d521a3008695f834d5aa8c9bb61f9075b37a8 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If48d66d89172db94ee1839063396156a3a947601
Diffstat (limited to 'src/imports/templates')
-rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 88ee9b58..9f518335 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -186,6 +186,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickDialogButtonBox>(uri, 2, 1, "DialogButtonBox"); qmlRegisterType<QQuickDialogButtonBoxAttached>(); qmlRegisterType<QQuickMenuSeparator>(uri, 2, 1, "MenuSeparator"); + qmlRegisterType<QQuickPage, 1>(uri, 2, 1, "Page"); qmlRegisterType<QQuickRangeSlider, 1>(uri, 2, 1, "RangeSlider"); qmlRegisterType<QQuickRoundButton, 1>(uri, 2, 1, "RoundButton"); qmlRegisterType<QQuickSlider, 1>(uri, 2, 1, "Slider"); |