summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2023-06-07 21:17:18 +0200
committerRobert Griebl <robert.griebl@qt.io>2023-06-16 20:51:58 +0200
commitc92700b1c478d57aa70e12ddb3c79b938aff1d5d (patch)
treecde333a5bbb68bc583c2f8d659dba843a97f64bc
parent3a862de3f8b7244b4281c4a4f7b5eedb2cc3188a (diff)
Cleanup our custom qmltype generation
1) no qmltype data was generated for IntentServerHandler at all 2) IntentServerHandler derived from IntentHandler, but they are registered in different QML namespaces, which qmllint didn't like -> refactored to have a common base class. 3) the "remove the QtAM:: namespace prefix" code in the generator removed too much, e.g. stripping the class context from enums. 4) the exportMetaObjectRevisions field was not populated 5) module dependencies are handled via qmldir nowadays 6) potential defaultProperty settings were not exported Pick-to: 6.6 6.5 6.5.2 6.2 Fixes: QTBUG-114355 Fixes: QTBUG-114356 Change-Id: I137d2f694e92c08a323c6f3f502b24ffd4819e2e Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat
-rw-r--r--qmltypes/QtApplicationManager/Application/plugins.qmltypes52
-rw-r--r--qmltypes/QtApplicationManager/Application/qmldir2
-rw-r--r--qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes696
-rw-r--r--qmltypes/QtApplicationManager/SystemUI/qmldir1
-rw-r--r--qmltypes/QtApplicationManager/plugins.qmltypes208
-rw-r--r--qmltypes/QtApplicationManager/qmldir1
-rw-r--r--src/intent-client-lib/intentclient.cpp6
-rw-r--r--src/intent-client-lib/intentclient.h12
-rw-r--r--src/intent-client-lib/intentclientrequest.h2
-rw-r--r--src/intent-client-lib/intenthandler.cpp26
-rw-r--r--src/intent-client-lib/intenthandler.h30
-rw-r--r--src/intent-server-lib/intent.h2
-rw-r--r--src/launcher-lib/dbusapplicationinterface.h2
-rw-r--r--src/manager-lib/intentaminterface.cpp4
-rw-r--r--src/manager-lib/intentaminterface.h3
-rw-r--r--src/tools/dumpqmltypes/dumpqmltypes.cpp89
16 files changed, 619 insertions, 517 deletions
diff --git a/qmltypes/QtApplicationManager/Application/plugins.qmltypes b/qmltypes/QtApplicationManager/Application/plugins.qmltypes
index 9e1d7476..0de56fe8 100644
--- a/qmltypes/QtApplicationManager/Application/plugins.qmltypes
+++ b/qmltypes/QtApplicationManager/Application/plugins.qmltypes
@@ -7,41 +7,32 @@ import QtQuick.tooling 1.2
// appman-dumpqmltypes
Module {
- dependencies: [ "QtQuick.Window 6.5", "QtQuick 6.5" ]
Component {
name: "IntentHandler"
exports: [ "QtApplicationManager.Application/IntentHandler 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
- prototype: "QObject"
- Property { name: "intentIds"; type: "QStringList"; }
- Signal {
- name: "intentIdsChanged"
- Parameter { name: "intentId"; type: "QStringList"; }
- }
- Signal {
- name: "requestReceived"
- Parameter { name: "request"; type: "IntentClientRequest"; isPointer: true; }
- }
+ exportMetaObjectRevisions: [ 512 ]
+ prototype: "AbstractIntentHandler"
+ Property { name: "intentIds"; type: "QStringList" }
}
Component {
name: "ApplicationManagerWindow"
exports: [ "QtApplicationManager.Application/ApplicationManagerWindow 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QQuickWindowQmlImpl"
Signal {
name: "windowPropertyChanged"
- Parameter { name: "name"; type: "string"; }
- Parameter { name: "value"; type: "QVariant"; }
+ Parameter { name: "name"; type: "QString" }
+ Parameter { name: "value"; type: "QVariant" }
}
Method {
name: "setWindowProperty"
- Parameter { name: "name"; type: "string"; }
- Parameter { name: "value"; type: "QVariant"; }
+ Parameter { name: "name"; type: "QString" }
+ Parameter { name: "value"; type: "QVariant" }
}
Method {
name: "windowProperty"
type: "QVariant"
- Parameter { name: "name"; type: "string"; }
+ Parameter { name: "name"; type: "QString" }
}
Method {
name: "windowProperties"
@@ -51,15 +42,16 @@ Module {
Component {
name: "ApplicationInterface"
exports: [ "QtApplicationManager.Application/ApplicationInterface 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
+ isSingleton: true
isCreatable: false
- Property { name: "applicationId"; type: "string"; isReadonly: true }
- Property { name: "name"; type: "QVariantMap"; isReadonly: true }
- Property { name: "icon"; type: "QUrl"; isReadonly: true }
- Property { name: "version"; type: "string"; isReadonly: true }
- Property { name: "systemProperties"; type: "QVariantMap"; isReadonly: true }
- Property { name: "applicationProperties"; type: "QVariantMap"; isReadonly: true }
+ Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "name"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "icon"; type: "QUrl"; isReadonly: true; isConstant: true }
+ Property { name: "version"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "systemProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "applicationProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true }
Signal {
name: "quit"
}
@@ -71,23 +63,23 @@ Module {
}
Signal {
name: "openDocument"
- Parameter { name: "documentUrl"; type: "string"; }
- Parameter { name: "mimeType"; type: "string"; }
+ Parameter { name: "documentUrl"; type: "QString" }
+ Parameter { name: "mimeType"; type: "QString" }
}
Signal {
name: "interfaceCreated"
- Parameter { name: "interfaceName"; type: "string"; }
+ Parameter { name: "interfaceName"; type: "QString" }
}
Signal {
name: "slowAnimationsChanged"
- Parameter { name: "isSlow"; type: "bool"; }
+ Parameter { name: "isSlow"; type: "bool" }
}
Method {
name: "finishedInitialization"
}
Method {
name: "createNotification"
- type: "Notification"; isPointer: true;
+ type: "Notification"; isPointer: true
}
Method {
name: "acknowledgeQuit"
diff --git a/qmltypes/QtApplicationManager/Application/qmldir b/qmltypes/QtApplicationManager/Application/qmldir
index 4ed2cd67..a7228ccd 100644
--- a/qmltypes/QtApplicationManager/Application/qmldir
+++ b/qmltypes/QtApplicationManager/Application/qmldir
@@ -1 +1,3 @@
typeinfo plugins.qmltypes
+depends QtApplicationManager auto
+depends QtQuick auto
diff --git a/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes b/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
index 608b8606..a40030b6 100644
--- a/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
+++ b/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
@@ -7,53 +7,94 @@ import QtQuick.tooling 1.2
// appman-dumpqmltypes
Module {
- dependencies: [ "QtQuick.Window 6.5", "QtQuick 6.5" ]
Component {
name: "ProcessStatus"
exports: [ "QtApplicationManager.SystemUI/ProcessStatus 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
- Property { name: "applicationId"; type: "string"; }
- Property { name: "processId"; type: "int"; isReadonly: true }
+ Property { name: "applicationId"; type: "QString" }
+ Property { name: "processId"; type: "qlonglong"; isReadonly: true }
Property { name: "cpuLoad"; type: "double"; isReadonly: true }
Property { name: "memoryVirtual"; type: "QVariantMap"; isReadonly: true }
Property { name: "memoryRss"; type: "QVariantMap"; isReadonly: true }
Property { name: "memoryPss"; type: "QVariantMap"; isReadonly: true }
- Property { name: "memoryReportingEnabled"; type: "bool"; }
- Property { name: "roleNames"; type: "QStringList"; isReadonly: true }
+ Property { name: "memoryReportingEnabled"; type: "bool" }
+ Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
Signal {
name: "applicationIdChanged"
- Parameter { name: "applicationId"; type: "string"; }
+ Parameter { name: "applicationId"; type: "QString" }
}
Signal {
name: "processIdChanged"
- Parameter { name: "processId"; type: "int"; }
+ Parameter { name: "processId"; type: "qlonglong" }
}
Signal {
name: "cpuLoadChanged"
}
Signal {
name: "memoryReportingChanged"
- Parameter { name: "memoryVirtual"; type: "QVariantMap"; }
- Parameter { name: "memoryRss"; type: "QVariantMap"; }
- Parameter { name: "memoryPss"; type: "QVariantMap"; }
+ Parameter { name: "memoryVirtual"; type: "QVariantMap" }
+ Parameter { name: "memoryRss"; type: "QVariantMap" }
+ Parameter { name: "memoryPss"; type: "QVariantMap" }
}
Signal {
name: "memoryReportingEnabledChanged"
- Parameter { name: "enabled"; type: "bool"; }
+ Parameter { name: "enabled"; type: "bool" }
}
Method {
name: "update"
}
}
Component {
+ name: "IntentServerHandler"
+ exports: [ "QtApplicationManager.SystemUI/IntentServerHandler 2.0" ]
+ exportMetaObjectRevisions: [ 512 ]
+ prototype: "AbstractIntentHandler"
+ Property { name: "intentIds"; type: "QStringList" }
+ Property { name: "icon"; type: "QUrl" }
+ Property { name: "names"; type: "QVariantMap" }
+ Property { name: "descriptions"; type: "QVariantMap" }
+ Property { name: "categories"; type: "QStringList" }
+ Property { name: "visibility"; type: "Intent::Visibility" }
+ Property { name: "requiredCapabilities"; type: "QStringList" }
+ Property { name: "parameterMatch"; type: "QVariantMap" }
+ Method {
+ name: "setIcon"
+ Parameter { name: "icon"; type: "QUrl" }
+ }
+ Method {
+ name: "setNames"
+ Parameter { name: "names"; type: "QVariantMap" }
+ }
+ Method {
+ name: "setDescriptions"
+ Parameter { name: "descriptions"; type: "QVariantMap" }
+ }
+ Method {
+ name: "setCategories"
+ Parameter { name: "categories"; type: "QStringList" }
+ }
+ Method {
+ name: "setVisibility"
+ Parameter { name: "visibility"; type: "Intent::Visibility" }
+ }
+ Method {
+ name: "setRequiredCapabilities"
+ Parameter { name: "requiredCapabilities"; type: "QStringList" }
+ }
+ Method {
+ name: "setParameterMatch"
+ Parameter { name: "parameterMatch"; type: "QVariantMap" }
+ }
+ }
+ Component {
name: "IntentModel"
exports: [ "QtApplicationManager.SystemUI/IntentModel 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
Property { name: "count"; type: "int"; isReadonly: true }
- Property { name: "filterFunction"; type: "QJSValue"; }
- Property { name: "sortFunction"; type: "QJSValue"; }
+ Property { name: "filterFunction"; type: "QJSValue" }
+ Property { name: "sortFunction"; type: "QJSValue" }
Signal {
name: "countChanged"
}
@@ -66,164 +107,165 @@ Module {
Method {
name: "indexOfIntent"
type: "int"
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
Method {
name: "indexOfIntent"
type: "int"
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
}
Method {
name: "indexOfIntent"
type: "int"
- Parameter { name: "intent"; type: "Intent"; isPointer: true; }
+ Parameter { name: "intent"; type: "Intent"; isPointer: true }
}
Method {
name: "mapToSource"
type: "int"
- Parameter { name: "ourIndex"; type: "int"; }
+ Parameter { name: "ourIndex"; type: "int" }
}
Method {
name: "mapFromSource"
type: "int"
- Parameter { name: "sourceIndex"; type: "int"; }
+ Parameter { name: "sourceIndex"; type: "int" }
}
}
Component {
name: "Intent"
- exports: [ "QtApplicationManager.SystemUI/IntentObject 2.1" ]
- exportMetaObjectRevisions: [ 0 ]
+ exports: [ "QtApplicationManager.SystemUI/IntentObject 2.1", "QtApplicationManager.SystemUI/IntentObject 2.0" ]
+ exportMetaObjectRevisions: [ 513, 512 ]
prototype: "QObject"
isCreatable: false
Enum { name: "Visibility"; values: [ "Public", "Private" ] }
- Property { name: "intentId"; type: "string"; isReadonly: true }
- Property { name: "packageId"; type: "string"; isReadonly: true }
- Property { name: "applicationId"; type: "string"; isReadonly: true }
- Property { name: "visibility"; type: "Visibility"; isReadonly: true }
- Property { name: "requiredCapabilities"; type: "QStringList"; isReadonly: true }
- Property { name: "parameterMatch"; type: "QVariantMap"; isReadonly: true }
- Property { name: "icon"; type: "QUrl"; isReadonly: true }
- Property { name: "name"; type: "string"; isReadonly: true }
- Property { name: "names"; type: "QVariantMap"; isReadonly: true }
- Property { name: "description"; type: "string"; isReadonly: true }
- Property { name: "descriptions"; type: "QVariantMap"; isReadonly: true }
- Property { name: "categories"; type: "QStringList"; isReadonly: true }
- Property { name: "handleOnlyWhenRunning"; type: "bool"; isReadonly: true }
+ Property { name: "intentId"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "packageId"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "visibility"; type: "Intent::Visibility"; isReadonly: true; isConstant: true }
+ Property { name: "requiredCapabilities"; type: "QStringList"; isReadonly: true; isConstant: true }
+ Property { name: "parameterMatch"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "icon"; type: "QUrl"; isReadonly: true; isConstant: true }
+ Property { name: "name"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "names"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "description"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "descriptions"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "categories"; type: "QStringList"; isReadonly: true; isConstant: true }
+ Property { name: "handleOnlyWhenRunning"; type: "bool"; revision: 513; isReadonly: true; isConstant: true }
}
Component {
name: "IntentServer"
exports: [ "QtApplicationManager.SystemUI/IntentServer 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QAbstractListModel"
isSingleton: true
Property { name: "count"; type: "int"; isReadonly: true }
Signal {
name: "intentAdded"
- Parameter { name: "intent"; type: "Intent"; isPointer: true; }
+ Parameter { name: "intent"; type: "Intent"; isPointer: true }
}
Signal {
name: "intentAboutToBeRemoved"
- Parameter { name: "intent"; type: "Intent"; isPointer: true; }
+ Parameter { name: "intent"; type: "Intent"; isPointer: true }
}
Signal {
name: "countChanged"
}
Signal {
name: "disambiguationRequest"
- Parameter { name: "requestId"; type: "QUuid"; }
- Parameter { name: "potentialIntents"; type: "QList<QObject*>"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ Parameter { name: "requestId"; type: "QUuid" }
+ Parameter { name: "potentialIntents"; type: "QList<QObject*>" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
Method {
name: "get"
type: "QVariantMap"
- Parameter { name: "index"; type: "int"; }
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "intent"
- type: "Intent"; isPointer: true;
- Parameter { name: "index"; type: "int"; }
+ type: "Intent"; isPointer: true
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "applicationIntent"
- type: "Intent"; isPointer: true;
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ type: "Intent"; isPointer: true
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
Method {
name: "applicationIntent"
- type: "Intent"; isPointer: true;
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
+ type: "Intent"; isPointer: true
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
}
Method {
name: "packageIntent"
- type: "Intent"; isPointer: true;
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "packageId"; type: "string"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ type: "Intent"; isPointer: true
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "packageId"; type: "QString" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
Method {
name: "packageIntent"
- type: "Intent"; isPointer: true;
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "packageId"; type: "string"; }
+ type: "Intent"; isPointer: true
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "packageId"; type: "QString" }
}
Method {
name: "packageIntent"
- type: "Intent"; isPointer: true;
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "packageId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ type: "Intent"; isPointer: true
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "packageId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
Method {
name: "packageIntent"
- type: "Intent"; isPointer: true;
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "packageId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
+ type: "Intent"; isPointer: true
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "packageId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
}
Method {
name: "indexOfIntent"
type: "int"
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
Method {
name: "indexOfIntent"
type: "int"
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
}
Method {
name: "indexOfIntent"
type: "int"
- Parameter { name: "intent"; type: "Intent"; isPointer: true; }
+ Parameter { name: "intent"; type: "Intent"; isPointer: true }
}
Method {
name: "acknowledgeDisambiguationRequest"
- Parameter { name: "requestId"; type: "QUuid"; }
- Parameter { name: "selectedIntent"; type: "Intent"; isPointer: true; }
+ Parameter { name: "requestId"; type: "QUuid" }
+ Parameter { name: "selectedIntent"; type: "Intent"; isPointer: true }
}
Method {
name: "rejectDisambiguationRequest"
- Parameter { name: "requestId"; type: "QUuid"; }
+ Parameter { name: "requestId"; type: "QUuid" }
}
}
Component {
name: "WindowItem"
exports: [ "QtApplicationManager.SystemUI/WindowItem 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QQuickItem"
- Property { name: "window"; type: "Window"; isPointer: true; }
+ defaultProperty: "contentItemData"
+ Property { name: "window"; type: "Window"; isPointer: true }
Property { name: "primary"; type: "bool"; isReadonly: true }
- Property { name: "objectFollowsItemSize"; type: "bool"; }
+ Property { name: "objectFollowsItemSize"; type: "bool" }
Property { name: "contentItemData"; type: "QQmlListProperty<QObject>"; isReadonly: true }
Signal {
name: "windowChanged"
@@ -244,22 +286,22 @@ Module {
Component {
name: "Window"
exports: [ "QtApplicationManager.SystemUI/WindowObject 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
isCreatable: false
Enum { name: "ContentState"; values: [ "SurfaceWithContent", "SurfaceNoContent", "NoSurface" ] }
Property { name: "size"; type: "QSize"; isReadonly: true }
- Property { name: "contentState"; type: "ContentState"; isReadonly: true }
- Property { name: "application"; type: "Application"; isPointer: true; isReadonly: true }
- Property { name: "popup"; type: "bool"; isReadonly: true }
+ Property { name: "contentState"; type: "Window::ContentState"; isReadonly: true }
+ Property { name: "application"; type: "Application"; isPointer: true; isReadonly: true; isConstant: true }
+ Property { name: "popup"; type: "bool"; isReadonly: true; isConstant: true }
Property { name: "requestedPopupPosition"; type: "QPoint"; isReadonly: true }
Signal {
name: "sizeChanged"
}
Signal {
name: "windowPropertyChanged"
- Parameter { name: "name"; type: "string"; }
- Parameter { name: "value"; type: "QVariant"; }
+ Parameter { name: "name"; type: "QString" }
+ Parameter { name: "value"; type: "QVariant" }
}
Signal {
name: "isBeingDisplayedChanged"
@@ -273,13 +315,13 @@ Module {
Method {
name: "setWindowProperty"
type: "bool"
- Parameter { name: "name"; type: "string"; }
- Parameter { name: "value"; type: "QVariant"; }
+ Parameter { name: "name"; type: "QString" }
+ Parameter { name: "value"; type: "QVariant" }
}
Method {
name: "windowProperty"
type: "QVariant"
- Parameter { name: "name"; type: "string"; }
+ Parameter { name: "name"; type: "QString" }
}
Method {
name: "windowProperties"
@@ -290,52 +332,52 @@ Module {
}
Method {
name: "resize"
- Parameter { name: "size"; type: "QSize"; }
+ Parameter { name: "size"; type: "QSize" }
}
}
Component {
name: "WindowManager"
exports: [ "QtApplicationManager.SystemUI/WindowManager 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QAbstractListModel"
isSingleton: true
Property { name: "count"; type: "int"; isReadonly: true }
- Property { name: "runningOnDesktop"; type: "bool"; isReadonly: true }
- Property { name: "slowAnimations"; type: "bool"; }
- Property { name: "allowUnknownUiClients"; type: "bool"; isReadonly: true }
+ Property { name: "runningOnDesktop"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "slowAnimations"; type: "bool" }
+ Property { name: "allowUnknownUiClients"; type: "bool"; isReadonly: true; isConstant: true }
Signal {
name: "countChanged"
}
Signal {
name: "slowAnimationsChanged"
- Parameter { name: ""; type: "bool"; }
+ Parameter { name: ""; type: "bool" }
}
Signal {
name: "raiseApplicationWindow"
- Parameter { name: "applicationId"; type: "string"; }
- Parameter { name: "applicationAliasId"; type: "string"; }
+ Parameter { name: "applicationId"; type: "QString" }
+ Parameter { name: "applicationAliasId"; type: "QString" }
}
Signal {
name: "windowAdded"
- Parameter { name: "window"; type: "Window"; isPointer: true; }
+ Parameter { name: "window"; type: "Window"; isPointer: true }
}
Signal {
name: "windowAboutToBeRemoved"
- Parameter { name: "window"; type: "Window"; isPointer: true; }
+ Parameter { name: "window"; type: "Window"; isPointer: true }
}
Signal {
name: "windowContentStateChanged"
- Parameter { name: "window"; type: "Window"; isPointer: true; }
+ Parameter { name: "window"; type: "Window"; isPointer: true }
}
Signal {
name: "windowPropertyChanged"
- Parameter { name: "window"; type: "Window"; isPointer: true; }
- Parameter { name: "name"; type: "string"; }
- Parameter { name: "value"; type: "QVariant"; }
+ Parameter { name: "window"; type: "Window"; isPointer: true }
+ Parameter { name: "name"; type: "QString" }
+ Parameter { name: "value"; type: "QVariant" }
}
Signal {
name: "compositorViewRegistered"
- Parameter { name: "view"; type: "QQuickWindow"; isPointer: true; }
+ Parameter { name: "view"; type: "QQuickWindow"; isPointer: true }
}
Signal {
name: "shutDownFinished"
@@ -343,39 +385,39 @@ Module {
Method {
name: "get"
type: "QVariantMap"
- Parameter { name: "index"; type: "int"; }
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "window"
- type: "Window"; isPointer: true;
- Parameter { name: "index"; type: "int"; }
+ type: "Window"; isPointer: true
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "windowsOfApplication"
type: "QList<QObject*>"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "indexOfWindow"
type: "int"
- Parameter { name: "window"; type: "Window"; isPointer: true; }
+ Parameter { name: "window"; type: "Window"; isPointer: true }
}
Method {
name: "addExtension"
- type: "QObject"; isPointer: true;
- Parameter { name: "component"; type: "QQmlComponent"; isPointer: true; }
+ type: "QObject"; isPointer: true
+ Parameter { name: "component"; type: "QQmlComponent"; isPointer: true }
}
Method {
name: "makeScreenshot"
type: "bool"
- Parameter { name: "filename"; type: "string"; }
- Parameter { name: "selector"; type: "string"; }
+ Parameter { name: "filename"; type: "QString" }
+ Parameter { name: "selector"; type: "QString" }
}
}
Component {
name: "Am"
exports: [ "QtApplicationManager.SystemUI/Am 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
isCreatable: false
Enum { name: "ExitStatus"; values: [ "NormalExit", "CrashExit", "ForcedExit" ] }
@@ -385,11 +427,11 @@ Module {
Component {
name: "ApplicationModel"
exports: [ "QtApplicationManager.SystemUI/ApplicationModel 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
Property { name: "count"; type: "int"; isReadonly: true }
- Property { name: "filterFunction"; type: "QJSValue"; }
- Property { name: "sortFunction"; type: "QJSValue"; }
+ Property { name: "filterFunction"; type: "QJSValue" }
+ Property { name: "sortFunction"; type: "QJSValue" }
Signal {
name: "countChanged"
}
@@ -402,31 +444,31 @@ Module {
Method {
name: "indexOfApplication"
type: "int"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "indexOfApplication"
type: "int"
- Parameter { name: "application"; type: "Application"; isPointer: true; }
+ Parameter { name: "application"; type: "Application"; isPointer: true }
}
Method {
name: "mapToSource"
type: "int"
- Parameter { name: "ourIndex"; type: "int"; }
+ Parameter { name: "ourIndex"; type: "int" }
}
Method {
name: "mapFromSource"
type: "int"
- Parameter { name: "sourceIndex"; type: "int"; }
+ Parameter { name: "sourceIndex"; type: "int" }
}
}
Component {
name: "AbstractContainer"
exports: [ "QtApplicationManager.SystemUI/Container 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
isCreatable: false
- Property { name: "controlGroup"; type: "string"; }
+ Property { name: "controlGroup"; type: "QString" }
Signal {
name: "ready"
}
@@ -438,67 +480,67 @@ Module {
}
Signal {
name: "applicationChanged"
- Parameter { name: "newApplication"; type: "Application"; isPointer: true; }
+ Parameter { name: "newApplication"; type: "Application"; isPointer: true }
}
Signal {
name: "controlGroupChanged"
- Parameter { name: "controlGroup"; type: "string"; }
+ Parameter { name: "controlGroup"; type: "QString" }
}
}
Component {
name: "AbstractRuntime"
exports: [ "QtApplicationManager.SystemUI/Runtime 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
isCreatable: false
- Property { name: "container"; type: "AbstractContainer"; isPointer: true; isReadonly: true }
+ Property { name: "container"; type: "AbstractContainer"; isPointer: true; isReadonly: true; isConstant: true }
Signal {
name: "stateChanged"
- Parameter { name: "newState"; type: "RunState"; }
+ Parameter { name: "newState"; type: "Am::RunState" }
}
Signal {
name: "finished"
- Parameter { name: "exitCode"; type: "int"; }
- Parameter { name: "status"; type: "ExitStatus"; }
+ Parameter { name: "exitCode"; type: "int" }
+ Parameter { name: "status"; type: "Am::ExitStatus" }
}
Signal {
name: "inProcessSurfaceItemReady"
- Parameter { name: "window"; type: "InProcessSurfaceItem>"; }
+ Parameter { name: "window"; type: "QSharedPointer<QtAM::InProcessSurfaceItem>" }
}
}
Component {
name: "Application"
exports: [ "QtApplicationManager.SystemUI/ApplicationObject 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
isCreatable: false
Enum { name: "State"; values: [ "Installed", "BeingInstalled", "BeingUpdated", "BeingDowngraded", "BeingRemoved" ] }
- Property { name: "id"; type: "string"; isReadonly: true }
- Property { name: "name"; type: "string"; isReadonly: true }
+ Property { name: "id"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "name"; type: "QString"; isReadonly: true }
Property { name: "names"; type: "QVariantMap"; isReadonly: true }
- Property { name: "description"; type: "string"; isReadonly: true }
+ Property { name: "description"; type: "QString"; isReadonly: true }
Property { name: "descriptions"; type: "QVariantMap"; isReadonly: true }
Property { name: "categories"; type: "QStringList"; isReadonly: true }
Property { name: "icon"; type: "QUrl"; isReadonly: true }
- Property { name: "runtimeName"; type: "string"; isReadonly: true }
- Property { name: "runtimeParameters"; type: "QVariantMap"; isReadonly: true }
- Property { name: "capabilities"; type: "QStringList"; isReadonly: true }
- Property { name: "documentUrl"; type: "string"; isReadonly: true }
- Property { name: "supportedMimeTypes"; type: "QStringList"; isReadonly: true }
- Property { name: "applicationProperties"; type: "QVariantMap"; isReadonly: true }
+ Property { name: "runtimeName"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "runtimeParameters"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "capabilities"; type: "QStringList"; isReadonly: true; isConstant: true }
+ Property { name: "documentUrl"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "supportedMimeTypes"; type: "QStringList"; isReadonly: true; isConstant: true }
+ Property { name: "applicationProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true }
Property { name: "runtime"; type: "AbstractRuntime"; isPointer: true; isReadonly: true }
Property { name: "lastExitCode"; type: "int"; isReadonly: true }
- Property { name: "lastExitStatus"; type: "ExitStatus"; isReadonly: true }
- Property { name: "codeDir"; type: "string"; isReadonly: true }
- Property { name: "runState"; type: "RunState"; isReadonly: true }
- Property { name: "package"; type: "Package"; isPointer: true; isReadonly: true }
- Property { name: "builtIn"; type: "bool"; isReadonly: true }
- Property { name: "alias"; type: "bool"; isReadonly: true }
- Property { name: "nonAliased"; type: "Application"; isPointer: true; isReadonly: true }
- Property { name: "version"; type: "string"; isReadonly: true }
- Property { name: "state"; type: "State"; isReadonly: true }
+ Property { name: "lastExitStatus"; type: "Am::ExitStatus"; isReadonly: true }
+ Property { name: "codeDir"; type: "QString"; isReadonly: true }
+ Property { name: "runState"; type: "Am::RunState"; isReadonly: true }
+ Property { name: "package"; type: "Package"; isPointer: true; isReadonly: true; isConstant: true }
+ Property { name: "builtIn"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "alias"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "nonAliased"; type: "Application"; isPointer: true; isReadonly: true; isConstant: true }
+ Property { name: "version"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "state"; type: "Application::State"; isReadonly: true }
Property { name: "blocked"; type: "bool"; isReadonly: true }
- Property { name: "supportsApplicationInterface"; type: "bool"; isReadonly: true }
+ Property { name: "supportsApplicationInterface"; type: "bool"; isReadonly: true; isConstant: true }
Signal {
name: "bulkChange"
}
@@ -516,20 +558,20 @@ Module {
}
Signal {
name: "stateChanged"
- Parameter { name: "state"; type: "State"; }
+ Parameter { name: "state"; type: "Application::State" }
}
Signal {
name: "runStateChanged"
- Parameter { name: "state"; type: "RunState"; }
+ Parameter { name: "state"; type: "Am::RunState" }
}
Signal {
name: "blockedChanged"
- Parameter { name: "blocked"; type: "bool"; }
+ Parameter { name: "blocked"; type: "bool" }
}
Method {
name: "start"
type: "bool"
- Parameter { name: "documentUrl"; type: "string"; }
+ Parameter { name: "documentUrl"; type: "QString" }
}
Method {
name: "start"
@@ -538,17 +580,17 @@ Module {
Method {
name: "debug"
type: "bool"
- Parameter { name: "debugWrapper"; type: "string"; }
- Parameter { name: "documentUrl"; type: "string"; }
+ Parameter { name: "debugWrapper"; type: "QString" }
+ Parameter { name: "documentUrl"; type: "QString" }
}
Method {
name: "debug"
type: "bool"
- Parameter { name: "debugWrapper"; type: "string"; }
+ Parameter { name: "debugWrapper"; type: "QString" }
}
Method {
name: "stop"
- Parameter { name: "forceKill"; type: "bool"; }
+ Parameter { name: "forceKill"; type: "bool" }
}
Method {
name: "stop"
@@ -557,7 +599,7 @@ Module {
Component {
name: "NotificationManager"
exports: [ "QtApplicationManager.SystemUI/NotificationManager 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QAbstractListModel"
isSingleton: true
Property { name: "count"; type: "int"; isReadonly: true }
@@ -566,135 +608,135 @@ Module {
}
Signal {
name: "notificationAdded"
- Parameter { name: "id"; type: "uint"; }
+ Parameter { name: "id"; type: "uint" }
}
Signal {
name: "notificationAboutToBeRemoved"
- Parameter { name: "id"; type: "uint"; }
+ Parameter { name: "id"; type: "uint" }
}
Signal {
name: "notificationChanged"
- Parameter { name: "id"; type: "uint"; }
- Parameter { name: "rolesChanged"; type: "QStringList"; }
+ Parameter { name: "id"; type: "uint" }
+ Parameter { name: "rolesChanged"; type: "QStringList" }
}
Method {
name: "get"
type: "QVariantMap"
- Parameter { name: "index"; type: "int"; }
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "notification"
type: "QVariantMap"
- Parameter { name: "id"; type: "uint"; }
+ Parameter { name: "id"; type: "uint" }
}
Method {
name: "indexOfNotification"
type: "int"
- Parameter { name: "id"; type: "uint"; }
+ Parameter { name: "id"; type: "uint" }
}
Method {
name: "acknowledgeNotification"
- Parameter { name: "id"; type: "uint"; }
+ Parameter { name: "id"; type: "uint" }
}
Method {
name: "triggerNotificationAction"
- Parameter { name: "id"; type: "uint"; }
- Parameter { name: "actionId"; type: "string"; }
+ Parameter { name: "id"; type: "uint" }
+ Parameter { name: "actionId"; type: "QString" }
}
Method {
name: "dismissNotification"
- Parameter { name: "id"; type: "uint"; }
+ Parameter { name: "id"; type: "uint" }
}
}
Component {
name: "PackageManager"
exports: [ "QtApplicationManager.SystemUI/PackageManager 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QAbstractListModel"
isSingleton: true
Property { name: "count"; type: "int"; isReadonly: true }
- Property { name: "allowInstallationOfUnsignedPackages"; type: "bool"; isReadonly: true }
- Property { name: "developmentMode"; type: "bool"; isReadonly: true }
- Property { name: "hardwareId"; type: "string"; isReadonly: true }
+ Property { name: "allowInstallationOfUnsignedPackages"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "developmentMode"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "hardwareId"; type: "QString"; isReadonly: true; isConstant: true }
Property { name: "ready"; type: "bool"; isReadonly: true }
- Property { name: "installationLocation"; type: "QVariantMap"; isReadonly: true }
- Property { name: "documentLocation"; type: "QVariantMap"; isReadonly: true }
- Property { name: "applicationUserIdSeparation"; type: "bool"; isReadonly: true }
- Property { name: "commonApplicationGroupId"; type: "uint"; isReadonly: true }
+ Property { name: "installationLocation"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "documentLocation"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "applicationUserIdSeparation"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "commonApplicationGroupId"; type: "uint"; isReadonly: true; isConstant: true }
Signal {
name: "readyChanged"
- Parameter { name: "b"; type: "bool"; }
+ Parameter { name: "b"; type: "bool" }
}
Signal {
name: "countChanged"
}
Signal {
name: "packageAdded"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Signal {
name: "packageAboutToBeRemoved"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Signal {
name: "packageChanged"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "changedRoles"; type: "QStringList"; }
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "changedRoles"; type: "QStringList" }
}
Signal {
name: "taskStarted"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Signal {
name: "taskProgressChanged"
- Parameter { name: "taskId"; type: "string"; }
- Parameter { name: "progress"; type: "double"; }
+ Parameter { name: "taskId"; type: "QString" }
+ Parameter { name: "progress"; type: "double" }
}
Signal {
name: "taskFinished"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Signal {
name: "taskFailed"
- Parameter { name: "taskId"; type: "string"; }
- Parameter { name: "errorCode"; type: "int"; }
- Parameter { name: "errorString"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
+ Parameter { name: "errorCode"; type: "int" }
+ Parameter { name: "errorString"; type: "QString" }
}
Signal {
name: "taskStateChanged"
- Parameter { name: "taskId"; type: "string"; }
- Parameter { name: "newState"; type: "TaskState"; }
+ Parameter { name: "taskId"; type: "QString" }
+ Parameter { name: "newState"; type: "AsynchronousTask::TaskState" }
}
Signal {
name: "taskRequestingInstallationAcknowledge"
- Parameter { name: "taskId"; type: "string"; }
- Parameter { name: "package"; type: "Package"; isPointer: true; }
- Parameter { name: "packageExtraMetaData"; type: "QVariantMap"; }
- Parameter { name: "packageExtraSignedMetaData"; type: "QVariantMap"; }
+ Parameter { name: "taskId"; type: "QString" }
+ Parameter { name: "package"; type: "Package"; isPointer: true }
+ Parameter { name: "packageExtraMetaData"; type: "QVariantMap" }
+ Parameter { name: "packageExtraSignedMetaData"; type: "QVariantMap" }
}
Signal {
name: "taskBlockingUntilInstallationAcknowledge"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "get"
type: "QVariantMap"
- Parameter { name: "index"; type: "int"; }
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "package"
- type: "Package"; isPointer: true;
- Parameter { name: "index"; type: "int"; }
+ type: "Package"; isPointer: true
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "package"
- type: "Package"; isPointer: true;
- Parameter { name: "id"; type: "string"; }
+ type: "Package"; isPointer: true
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "indexOfPackage"
type: "int"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "packageIds"
@@ -703,54 +745,54 @@ Module {
Method {
name: "get"
type: "QVariantMap"
- Parameter { name: "packageId"; type: "string"; }
+ Parameter { name: "packageId"; type: "QString" }
}
Method {
name: "installedPackageSize"
- type: "int"
- Parameter { name: "packageId"; type: "string"; }
+ type: "qlonglong"
+ Parameter { name: "packageId"; type: "QString" }
}
Method {
name: "installedPackageExtraMetaData"
type: "QVariantMap"
- Parameter { name: "packageId"; type: "string"; }
+ Parameter { name: "packageId"; type: "QString" }
}
Method {
name: "installedPackageExtraSignedMetaData"
type: "QVariantMap"
- Parameter { name: "packageId"; type: "string"; }
+ Parameter { name: "packageId"; type: "QString" }
}
Method {
name: "startPackageInstallation"
- type: "string"
- Parameter { name: "sourceUrl"; type: "string"; }
+ type: "QString"
+ Parameter { name: "sourceUrl"; type: "QString" }
}
Method {
name: "acknowledgePackageInstallation"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "removePackage"
- type: "string"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "keepDocuments"; type: "bool"; }
- Parameter { name: "force"; type: "bool"; }
+ type: "QString"
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "keepDocuments"; type: "bool" }
+ Parameter { name: "force"; type: "bool" }
}
Method {
name: "removePackage"
- type: "string"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "keepDocuments"; type: "bool"; }
+ type: "QString"
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "keepDocuments"; type: "bool" }
}
Method {
name: "taskState"
- type: "TaskState"
- Parameter { name: "taskId"; type: "string"; }
+ type: "AsynchronousTask::TaskState"
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "taskPackageId"
- type: "string"
- Parameter { name: "taskId"; type: "string"; }
+ type: "QString"
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "activeTaskIds"
@@ -759,70 +801,70 @@ Module {
Method {
name: "cancelTask"
type: "bool"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "compareVersions"
type: "int"
- Parameter { name: "version1"; type: "string"; }
- Parameter { name: "version2"; type: "string"; }
+ Parameter { name: "version1"; type: "QString" }
+ Parameter { name: "version2"; type: "QString" }
}
Method {
name: "validateDnsName"
type: "bool"
- Parameter { name: "name"; type: "string"; }
- Parameter { name: "minimumParts"; type: "int"; }
+ Parameter { name: "name"; type: "QString" }
+ Parameter { name: "minimumParts"; type: "int" }
}
Method {
name: "validateDnsName"
type: "bool"
- Parameter { name: "name"; type: "string"; }
+ Parameter { name: "name"; type: "QString" }
}
}
Component {
name: "ApplicationInstaller"
exports: [ "QtApplicationManager.SystemUI/ApplicationInstaller 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
isSingleton: true
- Property { name: "allowInstallationOfUnsignedPackages"; type: "bool"; isReadonly: true }
- Property { name: "developmentMode"; type: "bool"; isReadonly: true }
- Property { name: "applicationUserIdSeparation"; type: "bool"; isReadonly: true }
- Property { name: "commonApplicationGroupId"; type: "uint"; isReadonly: true }
+ Property { name: "allowInstallationOfUnsignedPackages"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "developmentMode"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "applicationUserIdSeparation"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "commonApplicationGroupId"; type: "uint"; isReadonly: true; isConstant: true }
Signal {
name: "taskStarted"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Signal {
name: "taskProgressChanged"
- Parameter { name: "taskId"; type: "string"; }
- Parameter { name: "progress"; type: "double"; }
+ Parameter { name: "taskId"; type: "QString" }
+ Parameter { name: "progress"; type: "double" }
}
Signal {
name: "taskFinished"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Signal {
name: "taskFailed"
- Parameter { name: "taskId"; type: "string"; }
- Parameter { name: "errorCode"; type: "int"; }
- Parameter { name: "errorString"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
+ Parameter { name: "errorCode"; type: "int" }
+ Parameter { name: "errorString"; type: "QString" }
}
Signal {
name: "taskStateChanged"
- Parameter { name: "taskId"; type: "string"; }
- Parameter { name: "newState"; type: "TaskState"; }
+ Parameter { name: "taskId"; type: "QString" }
+ Parameter { name: "newState"; type: "AsynchronousTask::TaskState" }
}
Signal {
name: "taskRequestingInstallationAcknowledge"
- Parameter { name: "taskId"; type: "string"; }
- Parameter { name: "applicationAsVariantMap"; type: "QVariantMap"; }
- Parameter { name: "packageExtraMetaData"; type: "QVariantMap"; }
- Parameter { name: "packageExtraSignedMetaData"; type: "QVariantMap"; }
+ Parameter { name: "taskId"; type: "QString" }
+ Parameter { name: "applicationAsVariantMap"; type: "QVariantMap" }
+ Parameter { name: "packageExtraMetaData"; type: "QVariantMap" }
+ Parameter { name: "packageExtraSignedMetaData"; type: "QVariantMap" }
}
Signal {
name: "taskBlockingUntilInstallationAcknowledge"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "installationLocationIds"
@@ -830,46 +872,46 @@ Module {
}
Method {
name: "installationLocationIdFromApplication"
- type: "string"
- Parameter { name: "applicationId"; type: "string"; }
+ type: "QString"
+ Parameter { name: "applicationId"; type: "QString" }
}
Method {
name: "getInstallationLocation"
type: "QVariantMap"
- Parameter { name: "installationLocationId"; type: "string"; }
+ Parameter { name: "installationLocationId"; type: "QString" }
}
Method {
name: "startPackageInstallation"
- type: "string"
- Parameter { name: "installationLocationId"; type: "string"; }
- Parameter { name: "sourceUrl"; type: "string"; }
+ type: "QString"
+ Parameter { name: "installationLocationId"; type: "QString" }
+ Parameter { name: "sourceUrl"; type: "QString" }
}
Method {
name: "acknowledgePackageInstallation"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "removePackage"
- type: "string"
- Parameter { name: "applicationId"; type: "string"; }
- Parameter { name: "keepDocuments"; type: "bool"; }
- Parameter { name: "force"; type: "bool"; }
+ type: "QString"
+ Parameter { name: "applicationId"; type: "QString" }
+ Parameter { name: "keepDocuments"; type: "bool" }
+ Parameter { name: "force"; type: "bool" }
}
Method {
name: "removePackage"
- type: "string"
- Parameter { name: "applicationId"; type: "string"; }
- Parameter { name: "keepDocuments"; type: "bool"; }
+ type: "QString"
+ Parameter { name: "applicationId"; type: "QString" }
+ Parameter { name: "keepDocuments"; type: "bool" }
}
Method {
name: "taskState"
- type: "TaskState"
- Parameter { name: "taskId"; type: "string"; }
+ type: "AsynchronousTask::TaskState"
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "taskApplicationId"
- type: "string"
- Parameter { name: "taskId"; type: "string"; }
+ type: "QString"
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "activeTaskIds"
@@ -878,91 +920,91 @@ Module {
Method {
name: "cancelTask"
type: "bool"
- Parameter { name: "taskId"; type: "string"; }
+ Parameter { name: "taskId"; type: "QString" }
}
Method {
name: "compareVersions"
type: "int"
- Parameter { name: "version1"; type: "string"; }
- Parameter { name: "version2"; type: "string"; }
+ Parameter { name: "version1"; type: "QString" }
+ Parameter { name: "version2"; type: "QString" }
}
Method {
name: "validateDnsName"
type: "bool"
- Parameter { name: "name"; type: "string"; }
- Parameter { name: "minimumParts"; type: "int"; }
+ Parameter { name: "name"; type: "QString" }
+ Parameter { name: "minimumParts"; type: "int" }
}
Method {
name: "validateDnsName"
type: "bool"
- Parameter { name: "name"; type: "string"; }
+ Parameter { name: "name"; type: "QString" }
}
Method {
name: "installedApplicationSize"
- type: "int"
- Parameter { name: "applicationId"; type: "string"; }
+ type: "qlonglong"
+ Parameter { name: "applicationId"; type: "QString" }
}
Method {
name: "installedApplicationExtraMetaData"
type: "QVariantMap"
- Parameter { name: "applicationId"; type: "string"; }
+ Parameter { name: "applicationId"; type: "QString" }
}
Method {
name: "installedApplicationExtraSignedMetaData"
type: "QVariantMap"
- Parameter { name: "applicationId"; type: "string"; }
+ Parameter { name: "applicationId"; type: "QString" }
}
}
Component {
name: "ApplicationManager"
exports: [ "QtApplicationManager.SystemUI/ApplicationManager 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QAbstractListModel"
isSingleton: true
Property { name: "count"; type: "int"; isReadonly: true }
- Property { name: "singleProcess"; type: "bool"; isReadonly: true }
+ Property { name: "singleProcess"; type: "bool"; isReadonly: true; isConstant: true }
Property { name: "shuttingDown"; type: "bool"; isReadonly: true }
- Property { name: "securityChecksEnabled"; type: "bool"; isReadonly: true }
- Property { name: "dummy"; type: "bool"; isReadonly: true }
+ Property { name: "securityChecksEnabled"; type: "bool"; isReadonly: true; isConstant: true }
+ Property { name: "dummy"; type: "bool"; isReadonly: true; isConstant: true }
Property { name: "windowManagerCompositorReady"; type: "bool"; isReadonly: true }
- Property { name: "systemProperties"; type: "QVariantMap"; isReadonly: true }
- Property { name: "containerSelectionFunction"; type: "QJSValue"; }
+ Property { name: "systemProperties"; type: "QVariantMap"; isReadonly: true; isConstant: true }
+ Property { name: "containerSelectionFunction"; type: "QJSValue" }
Signal {
name: "applicationRunStateChanged"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "runState"; type: "RunState"; }
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "runState"; type: "Am::RunState" }
}
Signal {
name: "applicationWasActivated"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "aliasId"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "aliasId"; type: "QString" }
}
Signal {
name: "countChanged"
}
Signal {
name: "applicationAdded"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Signal {
name: "applicationAboutToBeRemoved"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Signal {
name: "applicationChanged"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "changedRoles"; type: "QStringList"; }
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "changedRoles"; type: "QStringList" }
}
Signal {
name: "windowManagerCompositorReadyChanged"
- Parameter { name: "ready"; type: "bool"; }
+ Parameter { name: "ready"; type: "bool" }
}
Signal {
name: "openUrlRequested"
- Parameter { name: "requestId"; type: "string"; }
- Parameter { name: "url"; type: "string"; }
- Parameter { name: "mimeType"; type: "string"; }
- Parameter { name: "possibleAppIds"; type: "QStringList"; }
+ Parameter { name: "requestId"; type: "QString" }
+ Parameter { name: "url"; type: "QString" }
+ Parameter { name: "mimeType"; type: "QString" }
+ Parameter { name: "possibleAppIds"; type: "QStringList" }
}
Signal {
name: "memoryLowWarning"
@@ -985,36 +1027,36 @@ Module {
Method {
name: "get"
type: "QVariantMap"
- Parameter { name: "index"; type: "int"; }
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "application"
- type: "Application"; isPointer: true;
- Parameter { name: "index"; type: "int"; }
+ type: "Application"; isPointer: true
+ Parameter { name: "index"; type: "int" }
}
Method {
name: "application"
- type: "Application"; isPointer: true;
- Parameter { name: "id"; type: "string"; }
+ type: "Application"; isPointer: true
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "indexOfApplication"
type: "int"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "indexOfApplication"
type: "int"
- Parameter { name: "application"; type: "Application"; isPointer: true; }
+ Parameter { name: "application"; type: "Application"; isPointer: true }
}
Method {
name: "acknowledgeOpenUrlRequest"
- Parameter { name: "requestId"; type: "string"; }
- Parameter { name: "appId"; type: "string"; }
+ Parameter { name: "requestId"; type: "QString" }
+ Parameter { name: "appId"; type: "QString" }
}
Method {
name: "rejectOpenUrlRequest"
- Parameter { name: "requestId"; type: "string"; }
+ Parameter { name: "requestId"; type: "QString" }
}
Method {
name: "applicationIds"
@@ -1023,44 +1065,44 @@ Module {
Method {
name: "get"
type: "QVariantMap"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "startApplication"
type: "bool"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "documentUrl"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "documentUrl"; type: "QString" }
}
Method {
name: "startApplication"
type: "bool"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "debugApplication"
type: "bool"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "debugWrapper"; type: "string"; }
- Parameter { name: "documentUrl"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "debugWrapper"; type: "QString" }
+ Parameter { name: "documentUrl"; type: "QString" }
}
Method {
name: "debugApplication"
type: "bool"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "debugWrapper"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "debugWrapper"; type: "QString" }
}
Method {
name: "stopApplication"
- Parameter { name: "id"; type: "string"; }
- Parameter { name: "forceKill"; type: "bool"; }
+ Parameter { name: "id"; type: "QString" }
+ Parameter { name: "forceKill"; type: "bool" }
}
Method {
name: "stopApplication"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "stopAllApplications"
- Parameter { name: "forceKill"; type: "bool"; }
+ Parameter { name: "forceKill"; type: "bool" }
}
Method {
name: "stopAllApplications"
@@ -1068,27 +1110,27 @@ Module {
Method {
name: "openUrl"
type: "bool"
- Parameter { name: "url"; type: "string"; }
+ Parameter { name: "url"; type: "QString" }
}
Method {
name: "capabilities"
type: "QStringList"
- Parameter { name: "id"; type: "string"; }
+ Parameter { name: "id"; type: "QString" }
}
Method {
name: "identifyApplication"
- type: "string"
- Parameter { name: "pid"; type: "int"; }
+ type: "QString"
+ Parameter { name: "pid"; type: "qlonglong" }
}
Method {
name: "identifyAllApplications"
type: "QStringList"
- Parameter { name: "pid"; type: "int"; }
+ Parameter { name: "pid"; type: "qlonglong" }
}
Method {
name: "applicationRunState"
- type: "RunState"
- Parameter { name: "id"; type: "string"; }
+ type: "Am::RunState"
+ Parameter { name: "id"; type: "QString" }
}
}
}
diff --git a/qmltypes/QtApplicationManager/SystemUI/qmldir b/qmltypes/QtApplicationManager/SystemUI/qmldir
index 4ed2cd67..3216f9ea 100644
--- a/qmltypes/QtApplicationManager/SystemUI/qmldir
+++ b/qmltypes/QtApplicationManager/SystemUI/qmldir
@@ -1 +1,2 @@
typeinfo plugins.qmltypes
+depends QtApplicationManager auto
diff --git a/qmltypes/QtApplicationManager/plugins.qmltypes b/qmltypes/QtApplicationManager/plugins.qmltypes
index 14502933..c78fd140 100644
--- a/qmltypes/QtApplicationManager/plugins.qmltypes
+++ b/qmltypes/QtApplicationManager/plugins.qmltypes
@@ -7,17 +7,17 @@ import QtQuick.tooling 1.2
// appman-dumpqmltypes
Module {
- dependencies: [ "QtQuick.Window 6.5", "QtQuick 6.5" ]
Component {
name: "MonitorModel"
exports: [ "QtApplicationManager/MonitorModel 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QAbstractListModel"
+ defaultProperty: "dataSources"
Property { name: "dataSources"; type: "QQmlListProperty<QObject>"; isReadonly: true }
Property { name: "count"; type: "int"; isReadonly: true }
- Property { name: "maximumCount"; type: "int"; }
- Property { name: "interval"; type: "int"; }
- Property { name: "running"; type: "bool"; }
+ Property { name: "maximumCount"; type: "int" }
+ Property { name: "interval"; type: "int" }
+ Property { name: "running"; type: "bool" }
Signal {
name: "countChanged"
}
@@ -39,22 +39,22 @@ Module {
Method {
name: "get"
type: "QVariantMap"
- Parameter { name: "row"; type: "int"; }
+ Parameter { name: "row"; type: "int" }
}
}
Component {
name: "FrameTimer"
exports: [ "QtApplicationManager/FrameTimer 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
Property { name: "averageFps"; type: "double"; isReadonly: true }
Property { name: "minimumFps"; type: "double"; isReadonly: true }
Property { name: "maximumFps"; type: "double"; isReadonly: true }
Property { name: "jitterFps"; type: "double"; isReadonly: true }
- Property { name: "window"; type: "QObject"; isPointer: true; }
- Property { name: "interval"; type: "int"; }
- Property { name: "running"; type: "bool"; }
- Property { name: "roleNames"; type: "QStringList"; isReadonly: true }
+ Property { name: "window"; type: "QObject"; isPointer: true }
+ Property { name: "interval"; type: "int" }
+ Property { name: "running"; type: "bool" }
+ Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
Signal {
name: "updated"
}
@@ -74,11 +74,11 @@ Module {
Component {
name: "IoStatus"
exports: [ "QtApplicationManager/IoStatus 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
- Property { name: "deviceNames"; type: "QStringList"; }
+ Property { name: "deviceNames"; type: "QStringList" }
Property { name: "ioLoad"; type: "QVariantMap"; isReadonly: true }
- Property { name: "roleNames"; type: "QStringList"; isReadonly: true }
+ Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
Signal {
name: "deviceNamesChanged"
}
@@ -92,11 +92,11 @@ Module {
Component {
name: "MemoryStatus"
exports: [ "QtApplicationManager/MemoryStatus 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
- Property { name: "totalMemory"; type: "qulonglong"; isReadonly: true }
+ Property { name: "totalMemory"; type: "qulonglong"; isReadonly: true; isConstant: true }
Property { name: "memoryUsed"; type: "qulonglong"; isReadonly: true }
- Property { name: "roleNames"; type: "QStringList"; isReadonly: true }
+ Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
Signal {
name: "memoryUsedChanged"
}
@@ -107,10 +107,10 @@ Module {
Component {
name: "GpuStatus"
exports: [ "QtApplicationManager/GpuStatus 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
Property { name: "gpuLoad"; type: "double"; isReadonly: true }
- Property { name: "roleNames"; type: "QStringList"; isReadonly: true }
+ Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
Signal {
name: "gpuLoadChanged"
}
@@ -121,11 +121,11 @@ Module {
Component {
name: "CpuStatus"
exports: [ "QtApplicationManager/CpuStatus 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
Property { name: "cpuLoad"; type: "double"; isReadonly: true }
- Property { name: "cpuCores"; type: "int"; isReadonly: true }
- Property { name: "roleNames"; type: "QStringList"; isReadonly: true }
+ Property { name: "cpuCores"; type: "int"; isReadonly: true; isConstant: true }
+ Property { name: "roleNames"; type: "QStringList"; isReadonly: true; isConstant: true }
Signal {
name: "cpuLoadChanged"
}
@@ -134,22 +134,36 @@ Module {
}
}
Component {
+ name: "AbstractIntentHandler"
+ exports: [ "QtApplicationManager/AbstractIntentHandler 2.0" ]
+ exportMetaObjectRevisions: [ 512 ]
+ prototype: "QObject"
+ isCreatable: false
+ Signal {
+ name: "intentIdsChanged"
+ }
+ Signal {
+ name: "requestReceived"
+ Parameter { name: "request"; type: "IntentClientRequest"; isPointer: true }
+ }
+ }
+ Component {
name: "IntentClientRequest"
- exports: [ "QtApplicationManager/IntentRequest 2.1" ]
- exportMetaObjectRevisions: [ 0 ]
+ exports: [ "QtApplicationManager/IntentRequest 2.1", "QtApplicationManager/IntentRequest 2.0" ]
+ exportMetaObjectRevisions: [ 513, 512 ]
prototype: "QObject"
isCreatable: false
Enum { name: "Direction"; values: [ "ToSystem", "ToApplication" ] }
Property { name: "requestId"; type: "QUuid"; isReadonly: true }
- Property { name: "direction"; type: "Direction"; isReadonly: true }
- Property { name: "intentId"; type: "string"; isReadonly: true }
- Property { name: "applicationId"; type: "string"; isReadonly: true }
- Property { name: "requestingApplicationId"; type: "string"; isReadonly: true }
- Property { name: "parameters"; type: "QVariantMap"; isReadonly: true }
+ Property { name: "direction"; type: "IntentClientRequest::Direction"; isReadonly: true; isConstant: true }
+ Property { name: "intentId"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "applicationId"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "requestingApplicationId"; type: "QString"; isReadonly: true; isConstant: true }
+ Property { name: "parameters"; type: "QVariantMap"; isReadonly: true; isConstant: true }
Property { name: "succeeded"; type: "bool"; isReadonly: true }
- Property { name: "errorMessage"; type: "string"; isReadonly: true }
+ Property { name: "errorMessage"; type: "QString"; isReadonly: true }
Property { name: "result"; type: "QVariantMap"; isReadonly: true }
- Property { name: "broadcast"; type: "bool"; isReadonly: true }
+ Property { name: "broadcast"; type: "bool"; revision: 513; isReadonly: true; isConstant: true }
Signal {
name: "requestIdChanged"
}
@@ -158,201 +172,201 @@ Module {
}
Method {
name: "sendReply"
- Parameter { name: "result"; type: "QVariantMap"; }
+ Parameter { name: "result"; type: "QVariantMap" }
}
Method {
name: "sendErrorReply"
- Parameter { name: "errorMessage"; type: "string"; }
+ Parameter { name: "errorMessage"; type: "QString" }
}
}
Component {
name: "IntentClient"
- exports: [ "QtApplicationManager/IntentClient 2.1" ]
- exportMetaObjectRevisions: [ 0 ]
+ exports: [ "QtApplicationManager/IntentClient 2.1", "QtApplicationManager/IntentClient 2.0" ]
+ exportMetaObjectRevisions: [ 513, 512 ]
prototype: "QObject"
isSingleton: true
- Property { name: "systemUiId"; type: "string"; isReadonly: true }
+ Property { name: "systemUiId"; type: "QString"; revision: 513; isReadonly: true; isConstant: true }
Method {
name: "sendIntentRequest"
- type: "IntentClientRequest"; isPointer: true;
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ type: "IntentClientRequest"; isPointer: true
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
Method {
name: "sendIntentRequest"
- type: "IntentClientRequest"; isPointer: true;
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "applicationId"; type: "string"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ type: "IntentClientRequest"; isPointer: true
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "applicationId"; type: "QString" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
Method {
name: "broadcastIntentRequest"
- type: "bool"
- Parameter { name: "intentId"; type: "string"; }
- Parameter { name: "parameters"; type: "QVariantMap"; }
+ type: "bool"; revision: 513
+ Parameter { name: "intentId"; type: "QString" }
+ Parameter { name: "parameters"; type: "QVariantMap" }
}
}
Component {
name: "Notification"
exports: [ "QtApplicationManager/Notification 2.0" ]
- exportMetaObjectRevisions: [ 0 ]
+ exportMetaObjectRevisions: [ 512 ]
prototype: "QObject"
Enum { name: "Priority"; values: [ "Low", "Normal", "Critical" ] }
Property { name: "notificationId"; type: "uint"; isReadonly: true }
- Property { name: "visible"; type: "bool"; }
- Property { name: "summary"; type: "string"; }
- Property { name: "body"; type: "string"; }
- Property { name: "icon"; type: "QUrl"; }
- Property { name: "image"; type: "QUrl"; }
- Property { name: "category"; type: "string"; }
- Property { name: "priority"; type: "int"; }
- Property { name: "acknowledgeable"; type: "bool"; }
- Property { name: "timeout"; type: "int"; }
- Property { name: "sticky"; type: "bool"; }
- Property { name: "showProgress"; type: "bool"; }
- Property { name: "progress"; type: "double"; }
- Property { name: "actions"; type: "QVariantList"; }
- Property { name: "showActionsAsIcons"; type: "bool"; }
- Property { name: "dismissOnAction"; type: "bool"; }
- Property { name: "extended"; type: "QVariantMap"; }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "summary"; type: "QString" }
+ Property { name: "body"; type: "QString" }
+ Property { name: "icon"; type: "QUrl" }
+ Property { name: "image"; type: "QUrl" }
+ Property { name: "category"; type: "QString" }
+ Property { name: "priority"; type: "int" }
+ Property { name: "acknowledgeable"; type: "bool" }
+ Property { name: "timeout"; type: "int" }
+ Property { name: "sticky"; type: "bool" }
+ Property { name: "showProgress"; type: "bool" }
+ Property { name: "progress"; type: "double" }
+ Property { name: "actions"; type: "QVariantList" }
+ Property { name: "showActionsAsIcons"; type: "bool" }
+ Property { name: "dismissOnAction"; type: "bool" }
+ Property { name: "extended"; type: "QVariantMap" }
Signal {
name: "notificationIdChanged"
- Parameter { name: "notificationId"; type: "uint"; }
+ Parameter { name: "notificationId"; type: "uint" }
}
Signal {
name: "summaryChanged"
- Parameter { name: "summary"; type: "string"; }
+ Parameter { name: "summary"; type: "QString" }
}
Signal {
name: "bodyChanged"
- Parameter { name: "body"; type: "string"; }
+ Parameter { name: "body"; type: "QString" }
}
Signal {
name: "iconChanged"
- Parameter { name: "icon"; type: "QUrl"; }
+ Parameter { name: "icon"; type: "QUrl" }
}
Signal {
name: "imageChanged"
- Parameter { name: "image"; type: "QUrl"; }
+ Parameter { name: "image"; type: "QUrl" }
}
Signal {
name: "categoryChanged"
- Parameter { name: "category"; type: "string"; }
+ Parameter { name: "category"; type: "QString" }
}
Signal {
name: "priorityChanged"
- Parameter { name: "priority"; type: "int"; }
+ Parameter { name: "priority"; type: "int" }
}
Signal {
name: "acknowledgeableChanged"
- Parameter { name: "acknowledgeable"; type: "bool"; }
+ Parameter { name: "acknowledgeable"; type: "bool" }
}
Signal {
name: "timeoutChanged"
- Parameter { name: "timeout"; type: "int"; }
+ Parameter { name: "timeout"; type: "int" }
}
Signal {
name: "stickyChanged"
- Parameter { name: "sticky"; type: "bool"; }
+ Parameter { name: "sticky"; type: "bool" }
}
Signal {
name: "showProgressChanged"
- Parameter { name: "showProgress"; type: "bool"; }
+ Parameter { name: "showProgress"; type: "bool" }
}
Signal {
name: "progressChanged"
- Parameter { name: "progress"; type: "double"; }
+ Parameter { name: "progress"; type: "double" }
}
Signal {
name: "actionsChanged"
- Parameter { name: "actions"; type: "QVariantList"; }
+ Parameter { name: "actions"; type: "QVariantList" }
}
Signal {
name: "showActionsAsIconsChanged"
- Parameter { name: "showActionsAsIcons"; type: "bool"; }
+ Parameter { name: "showActionsAsIcons"; type: "bool" }
}
Signal {
name: "dismissOnActionChanged"
- Parameter { name: "dismissOnAction"; type: "bool"; }
+ Parameter { name: "dismissOnAction"; type: "bool" }
}
Signal {
name: "extendedChanged"
- Parameter { name: "extended"; type: "QVariantMap"; }
+ Parameter { name: "extended"; type: "QVariantMap" }
}
Signal {
name: "visibleChanged"
- Parameter { name: "visible"; type: "bool"; }
+ Parameter { name: "visible"; type: "bool" }
}
Signal {
name: "acknowledged"
}
Signal {
name: "actionTriggered"
- Parameter { name: "actionId"; type: "string"; }
+ Parameter { name: "actionId"; type: "QString" }
}
Method {
name: "setSummary"
- Parameter { name: "summary"; type: "string"; }
+ Parameter { name: "summary"; type: "QString" }
}
Method {
name: "setBody"
- Parameter { name: "boy"; type: "string"; }
+ Parameter { name: "boy"; type: "QString" }
}
Method {
name: "setIcon"
- Parameter { name: "icon"; type: "QUrl"; }
+ Parameter { name: "icon"; type: "QUrl" }
}
Method {
name: "setImage"
- Parameter { name: "image"; type: "QUrl"; }
+ Parameter { name: "image"; type: "QUrl" }
}
Method {
name: "setCategory"
- Parameter { name: "category"; type: "string"; }
+ Parameter { name: "category"; type: "QString" }
}
Method {
name: "setPriority"
- Parameter { name: "priority"; type: "int"; }
+ Parameter { name: "priority"; type: "int" }
}
Method {
name: "setAcknowledgeable"
- Parameter { name: "acknowledgeable"; type: "bool"; }
+ Parameter { name: "acknowledgeable"; type: "bool" }
}
Method {
name: "setTimeout"
- Parameter { name: "timeout"; type: "int"; }
+ Parameter { name: "timeout"; type: "int" }
}
Method {
name: "setSticky"
- Parameter { name: "sticky"; type: "bool"; }
+ Parameter { name: "sticky"; type: "bool" }
}
Method {
name: "setShowProgress"
- Parameter { name: "showProgress"; type: "bool"; }
+ Parameter { name: "showProgress"; type: "bool" }
}
Method {
name: "setProgress"
- Parameter { name: "progress"; type: "double"; }
+ Parameter { name: "progress"; type: "double" }
}
Method {
name: "setActions"
- Parameter { name: "actions"; type: "QVariantList"; }
+ Parameter { name: "actions"; type: "QVariantList" }
}
Method {
name: "setShowActionsAsIcons"
- Parameter { name: "showActionsAsIcons"; type: "bool"; }
+ Parameter { name: "showActionsAsIcons"; type: "bool" }
}
Method {
name: "setDismissOnAction"
- Parameter { name: "dismissOnAction"; type: "bool"; }
+ Parameter { name: "dismissOnAction"; type: "bool" }
}
Method {
name: "setExtended"
- Parameter { name: "extended"; type: "QVariantMap"; }
+ Parameter { name: "extended"; type: "QVariantMap" }
}
Method {
name: "setVisible"
- Parameter { name: "visible"; type: "bool"; }
+ Parameter { name: "visible"; type: "bool" }
}
Method {
name: "show"
diff --git a/qmltypes/QtApplicationManager/qmldir b/qmltypes/QtApplicationManager/qmldir
index 4ed2cd67..5d45a635 100644
--- a/qmltypes/QtApplicationManager/qmldir
+++ b/qmltypes/QtApplicationManager/qmldir
@@ -1 +1,2 @@
typeinfo plugins.qmltypes
+depends QtQuick auto
diff --git a/src/intent-client-lib/intentclient.cpp b/src/intent-client-lib/intentclient.cpp
index 4078108f..07ac3107 100644
--- a/src/intent-client-lib/intentclient.cpp
+++ b/src/intent-client-lib/intentclient.cpp
@@ -108,7 +108,7 @@ IntentClient::~IntentClient()
s_instance = nullptr;
}
-void IntentClient::registerHandler(IntentHandler *handler)
+void IntentClient::registerHandler(AbstractIntentHandler *handler)
{
QString applicationId = m_systemInterface->currentApplicationId(handler);
@@ -128,7 +128,7 @@ void IntentClient::registerHandler(IntentHandler *handler)
}
}
-void IntentClient::unregisterHandler(IntentHandler *handler)
+void IntentClient::unregisterHandler(AbstractIntentHandler *handler)
{
m_handlers.removeIf([handler](auto it) { return it.value() == handler; });
}
@@ -285,7 +285,7 @@ void IntentClient::requestToApplication(const QUuid &requestId, const QString &i
requestingApplicationId, requestId, intentId,
applicationId, parameters, broadcast);
- IntentHandler *handler = m_handlers.value(qMakePair(intentId, applicationId));
+ AbstractIntentHandler *handler = m_handlers.value(qMakePair(intentId, applicationId));
if (handler) {
QQmlEngine::setObjectOwnership(icr, QQmlEngine::JavaScriptOwnership);
if (!broadcast)
diff --git a/src/intent-client-lib/intentclient.h b/src/intent-client-lib/intentclient.h
index 7b2f14be..a21ed722 100644
--- a/src/intent-client-lib/intentclient.h
+++ b/src/intent-client-lib/intentclient.h
@@ -17,7 +17,7 @@
QT_BEGIN_NAMESPACE_AM
-class IntentHandler;
+class AbstractIntentHandler;
class IntentClientRequest;
class IntentClientSystemInterface;
@@ -27,7 +27,7 @@ class IntentClient : public QObject
{
Q_OBJECT
Q_CLASSINFO("AM-QmlType", "QtApplicationManager/IntentClient 2.1 SINGLETON")
- Q_PROPERTY(QString systemUiId READ systemUiId CONSTANT REVISION 1)
+ Q_PROPERTY(QString systemUiId READ systemUiId CONSTANT REVISION(2, 1))
public:
~IntentClient() override;
@@ -45,8 +45,8 @@ public:
void replyFromApplication(IntentClientRequest *icr, const QVariantMap &result);
void errorReplyFromApplication(IntentClientRequest *icr, const QString &errorMessage);
- void registerHandler(IntentHandler *handler);
- void unregisterHandler(IntentHandler *handler);
+ void registerHandler(AbstractIntentHandler *handler);
+ void unregisterHandler(AbstractIntentHandler *handler);
Q_INVOKABLE QT_PREPEND_NAMESPACE_AM(IntentClientRequest) *sendIntentRequest(const QString &intentId,
const QVariantMap &parameters);
@@ -54,7 +54,7 @@ public:
const QString &applicationId,
const QVariantMap &parameters);
- Q_REVISION(1) Q_INVOKABLE bool broadcastIntentRequest(const QString &intentId,
+ Q_REVISION(2, 1) Q_INVOKABLE bool broadcastIntentRequest(const QString &intentId,
const QVariantMap &parameters);
private:
@@ -72,7 +72,7 @@ private:
QList<QPointer<IntentClientRequest>> m_waiting;
QElapsedTimer m_lastWaitingCleanup;
- QMap<QPair<QString, QString>, IntentHandler *> m_handlers; // intentId + appId -> handler
+ QMap<QPair<QString, QString>, AbstractIntentHandler *> m_handlers; // intentId + appId -> handler
// no timeouts by default -- these have to be set at runtime
int m_replyFromSystemTimeout = 0;
diff --git a/src/intent-client-lib/intentclientrequest.h b/src/intent-client-lib/intentclientrequest.h
index c8617d4a..079210d7 100644
--- a/src/intent-client-lib/intentclientrequest.h
+++ b/src/intent-client-lib/intentclientrequest.h
@@ -30,7 +30,7 @@ class IntentClientRequest : public QObject
Q_PROPERTY(bool succeeded READ succeeded NOTIFY replyReceived)
Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY replyReceived)
Q_PROPERTY(QVariantMap result READ result NOTIFY replyReceived)
- Q_PROPERTY(bool broadcast READ isBroadcast CONSTANT REVISION 1)
+ Q_PROPERTY(bool broadcast READ isBroadcast CONSTANT REVISION(2, 1))
public:
enum class Direction { ToSystem, ToApplication };
diff --git a/src/intent-client-lib/intenthandler.cpp b/src/intent-client-lib/intenthandler.cpp
index 47761c1b..f101df2b 100644
--- a/src/intent-client-lib/intenthandler.cpp
+++ b/src/intent-client-lib/intenthandler.cpp
@@ -78,42 +78,48 @@ QT_BEGIN_NAMESPACE_AM
*/
IntentHandler::IntentHandler(QObject *parent)
+ : AbstractIntentHandler(parent)
+{ }
+
+
+AbstractIntentHandler::AbstractIntentHandler(QObject *parent)
: QObject(parent)
{ }
-IntentHandler::~IntentHandler()
+AbstractIntentHandler::~AbstractIntentHandler()
{
if (auto ie = IntentClient::instance())
ie->unregisterHandler(this);
}
-QStringList IntentHandler::intentIds() const
+QStringList AbstractIntentHandler::intentIds() const
{
return m_intentIds;
}
-void IntentHandler::setIntentIds(const QStringList &intentIds)
+void AbstractIntentHandler::setIntentIds(const QStringList &intentIds)
{
if (isComponentCompleted()) {
- qmlWarning(this) << "Cannot change the intentIds property of an IntentHandler after creation.";
+ qmlWarning(this) << "Cannot change the intentIds property of an intent handler after creation.";
return;
}
if (m_intentIds != intentIds) {
m_intentIds = intentIds;
- emit intentIdsChanged(intentIds);
+ emit intentIdsChanged();
}
}
-void IntentHandler::componentComplete()
+void AbstractIntentHandler::classBegin()
+{
+}
+
+void AbstractIntentHandler::componentComplete()
{
IntentClient::instance()->registerHandler(this);
m_completed = true;
}
-void IntentHandler::classBegin()
-{ }
-
-bool IntentHandler::isComponentCompleted() const
+bool AbstractIntentHandler::isComponentCompleted() const
{
return m_completed;
}
diff --git a/src/intent-client-lib/intenthandler.h b/src/intent-client-lib/intenthandler.h
index 5c801991..d4246949 100644
--- a/src/intent-client-lib/intenthandler.h
+++ b/src/intent-client-lib/intenthandler.h
@@ -17,39 +17,49 @@ QT_BEGIN_NAMESPACE_AM
class IntentClientRequest;
-class IntentHandler : public QObject, public QQmlParserStatus
+class AbstractIntentHandler : public QObject, public QQmlParserStatus
{
Q_OBJECT
- Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/IntentHandler 2.0")
-
Q_INTERFACES(QQmlParserStatus)
- Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds NOTIFY intentIdsChanged)
+ Q_CLASSINFO("AM-QmlType", "QtApplicationManager/AbstractIntentHandler 2.0 UNCREATABLE")
public:
- IntentHandler(QObject *parent = nullptr);
- ~IntentHandler() override;
+ AbstractIntentHandler(QObject *parent = nullptr);
+ ~AbstractIntentHandler() override;
QStringList intentIds() const;
void setIntentIds(const QStringList &intentId);
signals:
- void intentIdsChanged(const QStringList &intentId);
+ void intentIdsChanged();
void requestReceived(QT_PREPEND_NAMESPACE_AM(IntentClientRequest) *request);
protected:
- void componentComplete() override;
void classBegin() override;
-
+ void componentComplete() override;
bool isComponentCompleted() const;
private:
- Q_DISABLE_COPY(IntentHandler)
+ Q_DISABLE_COPY(AbstractIntentHandler)
QStringList m_intentIds;
bool m_completed = false;
};
+class IntentHandler : public AbstractIntentHandler
+{
+ Q_OBJECT
+ Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/IntentHandler 2.0")
+ Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds NOTIFY intentIdsChanged)
+
+public:
+ IntentHandler(QObject *parent = nullptr);
+
+private:
+ Q_DISABLE_COPY(IntentHandler)
+};
+
QT_END_NAMESPACE_AM
Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_AM(IntentHandler) *)
diff --git a/src/intent-server-lib/intent.h b/src/intent-server-lib/intent.h
index fd1d801a..155d416b 100644
--- a/src/intent-server-lib/intent.h
+++ b/src/intent-server-lib/intent.h
@@ -33,7 +33,7 @@ class Intent : public QObject
Q_PROPERTY(QVariantMap descriptions READ descriptions CONSTANT)
Q_PROPERTY(QStringList categories READ categories CONSTANT)
- Q_PROPERTY(bool handleOnlyWhenRunning READ handleOnlyWhenRunning CONSTANT REVISION 1)
+ Q_PROPERTY(bool handleOnlyWhenRunning READ handleOnlyWhenRunning CONSTANT REVISION(2, 1))
public:
enum Visibility {
diff --git a/src/launcher-lib/dbusapplicationinterface.h b/src/launcher-lib/dbusapplicationinterface.h
index 7df0cc22..79c3185e 100644
--- a/src/launcher-lib/dbusapplicationinterface.h
+++ b/src/launcher-lib/dbusapplicationinterface.h
@@ -26,7 +26,7 @@ class Controller;
class DBusApplicationInterface : public ApplicationInterface
{
Q_OBJECT
- Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/ApplicationInterface 2.0 UNCREATABLE")
+ Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/ApplicationInterface 2.0 UNCREATABLE SINGLETON")
Q_CLASSINFO("AM-QmlVirtualSuperClasses", "1")
public:
diff --git a/src/manager-lib/intentaminterface.cpp b/src/manager-lib/intentaminterface.cpp
index 14e96ecd..92a08d99 100644
--- a/src/manager-lib/intentaminterface.cpp
+++ b/src/manager-lib/intentaminterface.cpp
@@ -623,7 +623,7 @@ QT_BEGIN_NAMESPACE_AM
*/
IntentServerHandler::IntentServerHandler(QObject *parent)
- : IntentHandler(parent)
+ : AbstractIntentHandler(parent)
, m_intent(new Intent())
{ }
@@ -774,7 +774,7 @@ void IntentServerHandler::componentComplete()
qmlWarning(this) << "IntentServerHandler: could not add intent" << intentId;
}
- IntentHandler::componentComplete();
+ AbstractIntentHandler::componentComplete();
}
QT_END_NAMESPACE_AM
diff --git a/src/manager-lib/intentaminterface.h b/src/manager-lib/intentaminterface.h
index 17507243..70731ccc 100644
--- a/src/manager-lib/intentaminterface.h
+++ b/src/manager-lib/intentaminterface.h
@@ -162,7 +162,7 @@ private:
#endif // defined(AM_MULTI_PROCESS)
// server-side IntentHandlers
-class IntentServerHandler : public IntentHandler
+class IntentServerHandler : public AbstractIntentHandler
{
Q_OBJECT
Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/IntentServerHandler 2.0")
@@ -170,6 +170,7 @@ class IntentServerHandler : public IntentHandler
// the following properties cannot be changed after construction (hence, also no 'changed' signal)
// these replace the meta-data that's provided through the info.yaml manifests for client-side
// handlers
+ Q_PROPERTY(QStringList intentIds READ intentIds WRITE setIntentIds)
Q_PROPERTY(QUrl icon READ icon WRITE setIcon)
Q_PROPERTY(QVariantMap names READ names WRITE setNames)
Q_PROPERTY(QVariantMap descriptions READ descriptions WRITE setDescriptions)
diff --git a/src/tools/dumpqmltypes/dumpqmltypes.cpp b/src/tools/dumpqmltypes/dumpqmltypes.cpp
index e8ec8e0e..21f0681b 100644
--- a/src/tools/dumpqmltypes/dumpqmltypes.cpp
+++ b/src/tools/dumpqmltypes/dumpqmltypes.cpp
@@ -26,6 +26,7 @@
#include <QtAppManIntentClient/intentclient.h>
#include <QtAppManIntentClient/intentclientrequest.h>
#include <QtAppManIntentClient/intenthandler.h>
+#include <QtAppManManager/intentaminterface.h>
#include <QtAppManSharedMain/cpustatus.h>
#include <QtAppManSharedMain/gpustatus.h>
#include <QtAppManSharedMain/memorystatus.h>
@@ -66,12 +67,14 @@ static const QVector<const QMetaObject *> all = {
// intent-client-lib
&IntentClient::staticMetaObject,
&IntentClientRequest::staticMetaObject,
+ &AbstractIntentHandler::staticMetaObject,
&IntentHandler::staticMetaObject,
// intent-server-lib
&IntentServer::staticMetaObject,
&Intent::staticMetaObject,
&IntentModel::staticMetaObject,
+ &IntentServerHandler::staticMetaObject,
// monitor-lib
&CpuStatus::staticMetaObject,
@@ -83,27 +86,31 @@ static const QVector<const QMetaObject *> all = {
&MonitorModel::staticMetaObject
};
+static const QMap<QString, QStringList> moduleDepends = {
+ { qSL("QtApplicationManager.SystemUI"), { qSL("QtApplicationManager") } },
+ { qSL("QtApplicationManager.Application"), { qSL("QtApplicationManager"), qSL("QtQuick") } },
+ { qSL("QtApplicationManager"), { qSL("QtQuick") } },
+};
static QByteArray qmlTypeForMetaObect(const QMetaObject *mo, int level, bool indentFirstLine)
{
static auto stripNamespace = [](const QByteArray &identifier) -> QByteArray {
- int pos = identifier.lastIndexOf("::");
- return pos < 0 ? identifier : identifier.mid(pos + 2);
+#define AM_EMPTY_TOKEN
+ static const QByteArray qtamNamespace = QT_STRINGIFY(QT_PREPEND_NAMESPACE_AM(AM_EMPTY_TOKEN));
+#undef AM_EMPTY_TOKEN
+
+ if (identifier.startsWith(qtamNamespace))
+ return identifier.mid(qtamNamespace.length());
+ return identifier;
};
static auto mapTypeName = [](const QByteArray &type, bool stripPointer) -> QByteArray {
- if (type == "QString") {
- return "string";
- } else if (type == "qlonglong") {
- return "int";
- } else {
- QByteArray ba = type;
- if (ba.startsWith("const "))
- ba = ba.mid(6);
- ba = stripNamespace(ba);
- if (stripPointer && ba.endsWith('*'))
- ba.chop(1);
- return ba;
- }
+ QByteArray ba = type;
+ if (ba.startsWith("const "))
+ ba = ba.mid(6);
+ ba = stripNamespace(ba);
+ if (stripPointer && ba.endsWith('*'))
+ ba.chop(1);
+ return ba;
};
// parse the AM-QmlType Q_CLASSINFO
@@ -164,6 +171,13 @@ static QByteArray qmlTypeForMetaObect(const QMetaObject *mo, int level, bool ind
prototype = mo->classInfo(protoIdx).value();
}
+ // parse the DefaultProperty Q_CLASSINFO
+ QByteArray defaultProperty;
+ int defaultPropertyIdx = mo->indexOfClassInfo("DefaultProperty");
+ if (defaultPropertyIdx >= mo->classInfoOffset()) {
+ defaultProperty = mo->classInfo(defaultPropertyIdx).value();
+ }
+
QByteArray str;
QByteArray indent1 = QByteArray(level * 4, ' ');
QByteArray indent2 = QByteArray((level + 1) * 4, ' ');
@@ -172,18 +186,27 @@ static QByteArray qmlTypeForMetaObect(const QMetaObject *mo, int level, bool ind
if (indentFirstLine)
str.append(indent1);
+ QByteArrayList exports;
+ QByteArrayList exportRevs;
+ for (int minor = revMinor; minor >= 0; --minor) {
+ exports << QByteArray("\"" + type + " " + QByteArray::number(revMajor) + "."
+ + QByteArray::number(minor) + "\"");
+ exportRevs << QByteArray::number(revMajor * 256 + minor);
+ }
+
str = str
- + "Component {\n"
- + indent2 + "name: \"" + stripNamespace(supermo->className()) + "\"\n"
- + indent2 + "exports: [ \"" + type + " "
- + QByteArray::number(revMajor) + "." + QByteArray::number(revMinor) + "\" ]\n"
- + indent2 + "exportMetaObjectRevisions: [ 0 ]\n";
+ + "Component {\n"
+ + indent2 + "name: \"" + stripNamespace(supermo->className()) + "\"\n"
+ + indent2 + "exports: [ " + exports.join(", ") + " ]\n"
+ + indent2 + "exportMetaObjectRevisions: [ " + exportRevs.join(", ") + " ]\n";
if (mo->superClass())
str = str + indent2 + "prototype: \"" + prototype + "\"\n";
if (isSingleton)
str = str + indent2 + "isSingleton: true\n";
if (isUncreatable)
str = str + indent2 + "isCreatable: false\n";
+ if (!defaultProperty.isEmpty())
+ str = str + indent2 + "defaultProperty: \"" + defaultProperty + "\"\n";
int propertyOffset = supermo->propertyOffset();
@@ -216,11 +239,15 @@ static QByteArray qmlTypeForMetaObect(const QMetaObject *mo, int level, bool ind
str = str
+ indent2
+ "Property { name: \"" + p.name()
- + "\"; type: \"" + mapTypeName(p.typeName(), true) + "\";";
+ + "\"; type: \"" + mapTypeName(p.typeName(), true) + "\"";
+ if (int rev = p.revision())
+ str += "; revision: " + QByteArray::number(rev);
if (QByteArray(p.typeName()).endsWith('*'))
- str += " isPointer: true;";
+ str += "; isPointer: true";
if (!p.isWritable())
- str += " isReadonly: true";
+ str += "; isReadonly: true";
+ if (p.isConstant())
+ str += "; isConstant: true";
str = str + " }\n";
}
@@ -245,8 +272,10 @@ static QByteArray qmlTypeForMetaObect(const QMetaObject *mo, int level, bool ind
str = str + indent2 + methodtype + " {\n" + indent3 + "name: \"" + m.name() + "\"\n";
if (qstrcmp(m.typeName(), "void") != 0) {
str = str + indent3 + "type: \"" + mapTypeName(m.typeName(), true) + "\"";
+ if (int rev = m.revision())
+ str += "; revision: " + QByteArray::number(rev);
if (QByteArray(m.typeName()).endsWith('*'))
- str += "; isPointer: true;";
+ str += "; isPointer: true";
str += "\n";
}
@@ -254,9 +283,11 @@ static QByteArray qmlTypeForMetaObect(const QMetaObject *mo, int level, bool ind
str = str
+ indent3 + "Parameter { name: \""
+ m.parameterNames().at(j) + "\"; type: \""
- + mapTypeName(m.parameterTypes().at(j), true) + "\";";
+ + mapTypeName(m.parameterTypes().at(j), true) + "\"";
if (m.parameterTypes().at(j).endsWith('*'))
- str += " isPointer: true;";
+ str += "; isPointer: true";
+ if (m.parameterTypes().at(j).startsWith("const "))
+ str += "; isConstant: true";
str = str + " }\n";
}
@@ -361,6 +392,9 @@ int main(int argc, char **argv)
throw Exception(qmldirFile, "Failed to open for writing");
QTextStream qmldirOut(&qmldirFile);
qmldirOut << "typeinfo plugins.qmltypes\n";
+ const QStringList depends = moduleDepends.value(*it);
+ for (const auto &md : depends)
+ qmldirOut << "depends " << md << " auto\n";
qmldirFile.close();
QFile typesFile(importDir.absoluteFilePath(qSL("plugins.qmltypes")));
@@ -377,8 +411,7 @@ int main(int argc, char **argv)
"// This file was auto-generated by:\n"
"// appman-dumpqmltypes\n"
"\n"
- "Module {\n"
- " dependencies: [ \"QtQuick.Window 6.${QT_MINOR_VERSION}\", \"QtQuick 6.${QT_MINOR_VERSION}\" ]\n";
+ "Module {\n";
const char *footer = "}\n";
typesOut << QByteArray(header).replace("${QT_MINOR_VERSION}",
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 22:36:04 +0000