diff options
Diffstat (limited to 'src/imports/qtqml')
-rw-r--r-- | src/imports/qtqml/plugins.qmltypes | 20 | ||||
-rw-r--r-- | src/imports/qtqml/qtqml.pro | 6 |
2 files changed, 18 insertions, 8 deletions
diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes index 82333627a0..d548a78dd0 100644 --- a/src/imports/qtqml/plugins.qmltypes +++ b/src/imports/qtqml/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 -noforceqtquick QtQml 2.3' +// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml 2.13' Module { dependencies: [] @@ -96,7 +96,7 @@ Module { exports: ["QtQml/Connections 2.0", "QtQml/Connections 2.3"] exportMetaObjectRevisions: [0, 1] Property { name: "target"; type: "QObject"; isPointer: true } - Property { name: "enabled"; type: "bool" } + Property { name: "enabled"; revision: 1; type: "bool" } Property { name: "ignoreUnknownSignals"; type: "bool" } Signal { name: "enabledChanged"; revision: 1 } } @@ -198,9 +198,20 @@ Module { Component { name: "QQmlLoggingCategory" prototype: "QObject" - exports: ["QtQml/LoggingCategory 2.8"] - exportMetaObjectRevisions: [0] + exports: ["QtQml/LoggingCategory 2.12", "QtQml/LoggingCategory 2.8"] + exportMetaObjectRevisions: [1, 0] + Enum { + name: "DefaultLogLevel" + values: { + "Debug": 0, + "Info": 4, + "Warning": 1, + "Critical": 2, + "Fatal": 3 + } + } Property { name: "name"; type: "string" } + Property { name: "defaultLogLevel"; revision: 1; type: "DefaultLogLevel" } } Component { name: "QQmlTimer" @@ -229,5 +240,6 @@ Module { 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 } } } diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro index 05ef15a542..c00172ddc4 100644 --- a/src/imports/qtqml/qtqml.pro +++ b/src/imports/qtqml/qtqml.pro @@ -1,5 +1,5 @@ TARGETPATH = QtQml -QML_FILES += plugins.qmltypes +AUX_QML_FILES += plugins.qmltypes load(qml_module) @@ -7,8 +7,6 @@ load(qml_module) !cross_compile:if(build_pass|!debug_and_release) { qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) - # Use QtQml version defined in qmlplugindump source - # TODO: retrieve the correct version from QtQml - qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable QtQml 2.2 > $$PWD/plugins.qmltypes + qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable -noforceqtquick QtQml 2.$$QT_MINOR_VERSION > $$PWD/plugins.qmltypes QMAKE_EXTRA_TARGETS += qmltypes } |