diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-04 01:00:22 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-04 11:29:16 +0200 |
commit | 9c7121df1579d38c7f4136da6146d7acae8fedcc (patch) | |
tree | 0917e293d83b4c1ce635cf65185e6ad98fe66519 /src/imports/qtqml | |
parent | f529d38103a6c1c5c7b76ad92e0e5641719e369e (diff) | |
parent | c211b93bb87308601fe1c808634eb648d1949c40 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/imports/qtquick2/plugins.qmltypes
src/quick/items/qquickitemsmodule.cpp
Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5
Diffstat (limited to 'src/imports/qtqml')
-rw-r--r-- | src/imports/qtqml/plugins.qmltypes | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes index ea8ef2b190..e4ddb3ddd1 100644 --- a/src/imports/qtqml/plugins.qmltypes +++ b/src/imports/qtqml/plugins.qmltypes @@ -10,8 +10,8 @@ Module { dependencies: [] Component { name: "QObject" - exports: ["QML/QtObject 1.0", "QtQml/QtObject 2.0"] - exportMetaObjectRevisions: [0, 0] + exports: ["QtQml/QtObject 2.0"] + exportMetaObjectRevisions: [0] Property { name: "objectName"; type: "string" } Signal { name: "objectNameChanged" @@ -52,8 +52,8 @@ Module { Component { name: "QQmlComponent" prototype: "QObject" - exports: ["QML/Component 1.0", "QtQml/Component 2.0"] - exportMetaObjectRevisions: [0, 0] + exports: ["QtQml/Component 2.0"] + exportMetaObjectRevisions: [0] attachedType: "QQmlComponentAttached" Enum { name: "CompilationMode" @@ -242,18 +242,4 @@ Module { Method { name: "stop" } Method { name: "restart" } } - Component { - name: "QQuickMouseEvent" - prototype: "QObject" - Property { name: "x"; type: "double"; isReadonly: true } - Property { name: "y"; type: "double"; isReadonly: true } - Property { name: "button"; type: "int"; isReadonly: true } - Property { name: "buttons"; type: "int"; isReadonly: true } - Property { name: "modifiers"; type: "int"; isReadonly: true } - Property { name: "source"; revision: 7; type: "int"; isReadonly: true } - Property { name: "wasHeld"; type: "bool"; isReadonly: true } - Property { name: "isClick"; type: "bool"; isReadonly: true } - Property { name: "accepted"; type: "bool" } - Property { name: "flags"; revision: 11; type: "int"; isReadonly: true } - } } |