diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
| commit | 501d45012f746d843e0144c78202297a577758bc (patch) | |
| tree | 5c2b125327d49e3495b5f47995d93fb4215acbb4 /src/imports/templates/qtquicktemplates2plugin.cpp | |
| parent | 9e1b044afa994cdd77fd256cea78cd144e804d76 (diff) | |
| parent | 442843db6f5dce6b594448d43b380c9b884a7c91 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/quickcontrols2/qquickchecklabel.cpp
src/quickcontrols2/qquickchecklabel_p.h
src/quickcontrols2/qquickmnemoniclabel_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipedelegate.cpp
Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
Diffstat (limited to 'src/imports/templates/qtquicktemplates2plugin.cpp')
| -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 ffe2d50a..f5d1118f 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -299,7 +299,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickControl, 3>(uri, 2, 3, "Control"); qmlRegisterType<QQuickContainer, 3>(uri, 2, 3, "Container"); qmlRegisterType<QQuickDialog, 3>(uri, 2, 3, "Dialog"); - qmlRegisterType<QQuickDialogButtonBox>(uri, 2, 3, "DialogButtonBox"); + qmlRegisterType<QQuickDialogButtonBox, 3>(uri, 2, 3, "DialogButtonBox"); qRegisterMetaType<QQuickIcon>(); qmlRegisterType<QQuickMenu, 3>(uri, 2, 3, "Menu"); qmlRegisterType<QQuickMenuBar>(uri, 2, 3, "MenuBar"); |