diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-06 15:45:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-06 15:46:16 +0200 |
| commit | f447493bf9a8cf3490da0f5409d76e7f7fc98759 (patch) | |
| tree | 3a7849bd636b820b211c24885e7cdb72334338c6 /src/imports/templates/qtquicktemplates2plugin.cpp | |
| parent | 4696c5609ae5741a841d2222c45c1e020c03db25 (diff) | |
| parent | 4a8c2605c26acf575e181682f083e077b815ab4b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I509cd2e02874d9a2fe0febf8cc667833b7072b23
Diffstat (limited to 'src/imports/templates/qtquicktemplates2plugin.cpp')
| -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 81330447..ace2b316 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -299,6 +299,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickContainer, 3>(uri, 2, 3, "Container"); qmlRegisterType<QQuickDialog, 3>(uri, 2, 3, "Dialog"); qmlRegisterType<QQuickDialogButtonBox, 3>(uri, 2, 3, "DialogButtonBox"); + qmlRegisterType<QQuickIcon>(); qRegisterMetaType<QQuickIcon>(); qmlRegisterType<QQuickLabel, 3>(uri, 2, 3, "Label"); qmlRegisterType<QQuickMenu, 3>(uri, 2, 3, "Menu"); |