6 files changed, 16 insertions, 9 deletions
diff --git a/src/imports/tooling/Component.qml b/src/imports/tooling/Component.qml
index 773fcfecda..6a5cde3c2a 100644
--- a/src/imports/tooling/Component.qml
+++ b/src/imports/tooling/Component.qml
@@ -8,19 +8,22 @@ QtObject {
 
     property string file
     required property string name
+    property list<string> aliases: []
     property string prototype
-    property var exports: []
-    property var exportMetaObjectRevisions: []
-    property var interfaces: []
-    property var deferredNames: []
-    property var immediateNames: []
+    property list<string> exports: []
+    property list<int> exportMetaObjectRevisions
+    property list<string> interfaces
+    property list<string> deferredNames
+    property list<string> immediateNames
     property string attachedType
     property string valueType
     property string extension
     property bool isSingleton: false
-    property bool isCreatable: name.length > 0
+    property bool isCreatable: accessSemantics === "reference" && name.length > 0
+    property bool isStructured: false
     property bool isComposite: false
     property bool hasCustomParser: false
+    property bool extensionIsJavaScript: false
     property bool extensionIsNamespace: false
     property string accessSemantics: "reference"
     property string defaultProperty
diff --git a/src/imports/tooling/Enum.qml b/src/imports/tooling/Enum.qml
index 43ea330685..04276fdeed 100644
--- a/src/imports/tooling/Enum.qml
+++ b/src/imports/tooling/Enum.qml
@@ -5,6 +5,8 @@ import QML
 
 Member {
     property string alias
+    property string type
     property bool isFlag: false
+    property bool isScoped: false
     property var values: []
 }
diff --git a/src/imports/tooling/Method.qml b/src/imports/tooling/Method.qml
index fe4a1e3877..c66b52406e 100644
--- a/src/imports/tooling/Method.qml
+++ b/src/imports/tooling/Method.qml
@@ -12,4 +12,5 @@ Member {
     property bool isPointer: false
     property bool isJavaScriptFunction: false
     property bool isCloned: false
+    property bool isTypeConstant: false
 }
diff --git a/src/imports/tooling/Module.qml b/src/imports/tooling/Module.qml
index 487e235230..4aa9312a36 100644
--- a/src/imports/tooling/Module.qml
+++ b/src/imports/tooling/Module.qml
@@ -5,5 +5,5 @@ import QML
 
 QtObject {
     default property list<Component> components
-    property var dependencies: []
+    property list<string> dependencies: []
 }
diff --git a/src/imports/tooling/Parameter.qml b/src/imports/tooling/Parameter.qml
index 0f44074284..779f6102a2 100644
--- a/src/imports/tooling/Parameter.qml
+++ b/src/imports/tooling/Parameter.qml
@@ -8,5 +8,5 @@ QtObject {
     property string type
     property bool isPointer: false
     property bool isList: false
-    property bool isConstant: false
+    property bool isTypeConstant: false
 }
diff --git a/src/imports/tooling/Property.qml b/src/imports/tooling/Property.qml
index ba21db566c..f62b4ac992 100644
--- a/src/imports/tooling/Property.qml
+++ b/src/imports/tooling/Property.qml
@@ -10,7 +10,8 @@ Member {
     property bool isRequired: false
     property bool isList: false
     property bool isFinal: false
-    property bool isConstant: false
+    property bool isTypeConstant: false
+    property bool isPropertyConstant: false
     property int revision: 0
     property string bindable
     property string read