diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-01-15 20:08:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-17 12:27:07 +0100 |
| commit | 77b1d3c6be090eebffa09c78af75eb6770bfb280 (patch) | |
| tree | c8d18e8449de81803a3af7aa536354a355ccbd96 | |
| parent | 0c2873241ab6ff9fbdd4a1c1479e48d121879ccb (diff) | |
| download | qtquickcontrols-77b1d3c6be090eebffa09c78af75eb6770bfb280.tar.gz | |
Menus: Move private items into Controls.Private module
Keeping the same name as before to avoid any confusion when
importing the private module in other places.
Change-Id: I77986cb9ae4de40d83a2d477487dd806a0cb99d8
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| -rw-r--r-- | src/controls/plugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 55be136a..8113d01f 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -108,8 +108,6 @@ void QtQuickControlsPlugin::registerTypes(const char *uri) initResources(); qmlRegisterType<QQuickAction>(uri, 1, 0, "Action"); qmlRegisterType<QQuickExclusiveGroup>(uri, 1, 0, "ExclusiveGroup"); - qmlRegisterType<QQuickMenu>(uri, 1, 0, "MenuPrivate"); - qmlRegisterType<QQuickMenuBar>(uri, 1, 0, "MenuBarPrivate"); qmlRegisterType<QQuickMenuItem>(uri, 1, 0, "MenuItem"); qmlRegisterUncreatableType<QQuickMenuItemType>(uri, 1, 0, "MenuItemType", QLatin1String("Do not create objects of type MenuItemType")); @@ -139,6 +137,9 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri qmlRegisterSingletonType<QQuickTooltip>(private_uri, 1, 0, "Tooltip", QQuickControlsPrivate::registerTooltipModule); qmlRegisterSingletonType<QQuickControlSettings>(private_uri, 1, 0, "Settings", QQuickControlsPrivate::registerSettingsModule); + qmlRegisterType<QQuickMenu>(private_uri, 1, 0, "MenuPrivate"); + qmlRegisterType<QQuickMenuBar>(private_uri, 1, 0, "MenuBarPrivate"); + #ifdef QT_WIDGETS_LIB qmlRegisterType<QQuickStyleItem>(private_uri, 1, 0, "StyleItem"); engine->addImageProvider("__tablerow", new QQuickTableRowImageProvider); |