aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/platform/platform.pro2
-rw-r--r--src/imports/platform/plugins.qmltypes9
-rw-r--r--src/imports/platform/qtlabsplatformplugin.cpp1
3 files changed, 8 insertions, 4 deletions
diff --git a/src/imports/platform/platform.pro b/src/imports/platform/platform.pro
index 043b0172..06f34949 100644
--- a/src/imports/platform/platform.pro
+++ b/src/imports/platform/platform.pro
@@ -1,6 +1,6 @@
TARGET = qtlabsplatformplugin
TARGETPATH = Qt/labs/platform
-IMPORT_VERSION = 1.0
+IMPORT_VERSION = 1.1
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private
diff --git a/src/imports/platform/plugins.qmltypes b/src/imports/platform/plugins.qmltypes
index 7b165ef3..e9312047 100644
--- a/src/imports/platform/plugins.qmltypes
+++ b/src/imports/platform/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt.labs.platform 1.0'
+// 'qmlplugindump -nonrelocatable Qt.labs.platform 1.1'
Module {
dependencies: ["QtQuick 2.0"]
@@ -288,8 +288,11 @@ Module {
Component {
name: "QQuickPlatformMenuItem"
prototype: "QObject"
- exports: ["Qt.labs.platform/MenuItem 1.0"]
- exportMetaObjectRevisions: [0]
+ exports: [
+ "Qt.labs.platform/MenuItem 1.0",
+ "Qt.labs.platform/MenuItem 1.1"
+ ]
+ exportMetaObjectRevisions: [0, 1]
Property { name: "menu"; type: "QQuickPlatformMenu"; isReadonly: true; isPointer: true }
Property { name: "subMenu"; type: "QQuickPlatformMenu"; isReadonly: true; isPointer: true }
Property { name: "group"; type: "QQuickPlatformMenuItemGroup"; isPointer: true }
diff --git a/src/imports/platform/qtlabsplatformplugin.cpp b/src/imports/platform/qtlabsplatformplugin.cpp
index 98d5dcc4..90bdb121 100644
--- a/src/imports/platform/qtlabsplatformplugin.cpp
+++ b/src/imports/platform/qtlabsplatformplugin.cpp
@@ -91,6 +91,7 @@ void QtLabsPlatformPlugin::registerTypes(const char *uri)
qmlRegisterType<QQuickPlatformMenu>(uri, 1, 0, "Menu");
qmlRegisterType<QQuickPlatformMenuBar>(uri, 1, 0, "MenuBar");
qmlRegisterType<QQuickPlatformMenuItem>(uri, 1, 0, "MenuItem");
+ qmlRegisterType<QQuickPlatformMenuItem, 1>(uri, 1, 1, "MenuItem");
qmlRegisterType<QQuickPlatformMenuItemGroup>(uri, 1, 0, "MenuItemGroup");
qmlRegisterType<QQuickPlatformMenuSeparator>(uri, 1, 0, "MenuSeparator");
qRegisterMetaType<QPlatformMenu::MenuType>();