diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:38:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:38:35 +0100 |
| commit | ad964dd36a56dcd071bb3527ee4957c607365cce (patch) | |
| tree | 1e916348677fa8ca974916b9f3e3fcb3a55d3b48 /src/controls/plugin.cpp | |
| parent | e42603fd5b4efaa321dfc4417905510beafe288e (diff) | |
| parent | 148faf6278186986d1ca6afcdea0c361bcbf199e (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/controls/qquickmenubar.cpp
Change-Id: I4b036212b6dadded2c4d60dd07e91f629e80d9c2
Diffstat (limited to 'src/controls/plugin.cpp')
| -rw-r--r-- | src/controls/plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index b4a4963d3..da670dc8b 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -123,7 +123,7 @@ void QtQuickControlsPlugin::registerTypes(const char *uri) initResources(); qmlRegisterType<QQuickAction>(uri, 1, 0, "Action"); qmlRegisterType<QQuickExclusiveGroup1>(uri, 1, 0, "ExclusiveGroup"); - qmlRegisterType<QQuickMenuItem>(uri, 1, 0, "MenuItem"); + qmlRegisterType<QQuickMenuItem1>(uri, 1, 0, "MenuItem"); qmlRegisterUncreatableType<QQuickMenuItemType>(uri, 1, 0, "MenuItemType", QLatin1String("Do not create objects of type MenuItemType")); qmlRegisterType<QQuickMenuSeparator>(uri, 1, 0, "MenuSeparator"); @@ -161,8 +161,8 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri qmlRegisterType<QQuickTreeModelAdaptor>(private_uri, 1, 0, "TreeModelAdaptor"); qmlRegisterType<QQuickScenePosListener>(private_uri, 1, 0, "ScenePosListener"); - qmlRegisterType<QQuickMenu>(private_uri, 1, 0, "MenuPrivate"); - qmlRegisterType<QQuickMenuBar>(private_uri, 1, 0, "MenuBarPrivate"); + qmlRegisterType<QQuickMenu1>(private_uri, 1, 0, "MenuPrivate"); + qmlRegisterType<QQuickMenuBar1>(private_uri, 1, 0, "MenuBarPrivate"); qmlRegisterType<QQuickPopupWindow>(private_uri, 1, 0, "PopupWindow"); qmlRegisterUncreatableType<QAbstractItemModel>(private_uri, 1, 0, "AbstractItemModel", |