diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-16 00:10:56 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-16 12:40:51 +0000 |
| commit | dca7048361d7bae21d5b5d6715c725f1b3d62d1e (patch) | |
| tree | e754035c26f65220207b3b576a2271f956d57b04 /src/controls/plugin.cpp | |
| parent | add9875ec266351e7c2878a1e93da34181abab29 (diff) | |
| download | qtquickcontrols-dca7048361d7bae21d5b5d6715c725f1b3d62d1e.tar.gz | |
Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1
This avoids clashes between Qt Quick Controls and Qt Labs Controls.
Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01
Task-number: QTBUG-49794
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
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 b4a4963d..da670dc8 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", |