git.iko.soy/unity8
on xenial help sign in
Only generate .qmltypes files manually, no need to do it build-time.

It didn't work when cross-compiling either, and required builders to have otherwise unnecessary environment. Approved by: Michael Zanetti

commit507b643cfcc03f17b5602cbd5d99b0df4513271e authorMichał Sawicz <michal.sawicz@canonical.com> dateThu 17 Jul 2014, 09:36 (12 years ago) parentf5dd6b49f097ea
5 files changed+68−28
compare with xenial
unifiedsplit
plugins/Lights/Lights.qmltypes+45 plugins/Powerd/Powerd.qmltypes+6−13 plugins/Ubuntu/Gestures/Gestures.qmltypes+1 tests/mocks/Powerd/Powerd.qmltypes+6−13 tests/mocks/Unity/Unity.qmltypes+10−2
plugins/Lights/Lights.qmltypesnew file+45
@@ -0,0 +1,45 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Lights 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "Lights"
12+ prototype: "QObject"
13+ exports: ["Lights/Lights 0.1"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Enum {
18+ name: "State"
19+ values: {
20+ "Off": 0,
21+ "On": 1
22+ }
23+ }
24+ Property { name: "state"; type: "State" }
25+ Property { name: "color"; type: "QColor" }
26+ Property { name: "onMillisec"; type: "int" }
27+ Property { name: "offMillisec"; type: "int" }
28+ Signal {
29+ name: "stateChanged"
30+ Parameter { name: "newState"; type: "State" }
31+ }
32+ Signal {
33+ name: "colorChanged"
34+ Parameter { name: "color"; type: "QColor" }
35+ }
36+ Signal {
37+ name: "onMillisecChanged"
38+ Parameter { name: "onMs"; type: "int" }
39+ }
40+ Signal {
41+ name: "offMillisecChanged"
42+ Parameter { name: "offMs"; type: "int" }
43+ }
44+ }
45+}
plugins/Powerd/Powerd.qmltypes+6−13
@@ -15,19 +15,12 @@ Module {
1515 isSingleton: true
1616 exportMetaObjectRevisions: [0]
1717 Enum {
18− name: "DisplayFlag"
18+ name: "DisplayStateChangeReason"
1919 values: {
20− "UseProximity": 1,
21− "DisableAutoBrightness": 2,
22− "Bright": 4
23− }
24− }
25− Enum {
26− name: "DisplayFlags"
27− values: {
28− "UseProximity": 1,
29− "DisableAutoBrightness": 2,
30− "Bright": 4
20+ "Unknown": 0,
21+ "Inactivity": 1,
22+ "PowerKey": 2,
23+ "Proximity": 3
3124 }
3225 }
3326 Enum {
@@ -40,7 +33,7 @@ Module {
4033 Signal {
4134 name: "displayPowerStateChange"
4235 Parameter { name: "status"; type: "int" }
43− Parameter { name: "flags"; type: "uint" }
36+ Parameter { name: "reason"; type: "int" }
4437 }
4538 }
4639}
plugins/Ubuntu/Gestures/Gestures.qmltypes+1
@@ -141,6 +141,7 @@ Module {
141141 name: "touchSceneYChanged"
142142 Parameter { name: "value"; type: "double" }
143143 }
144+ Signal { name: "tapped" }
144145 }
145146 Component {
146147 name: "PressedOutsideNotifier"
tests/mocks/Powerd/Powerd.qmltypes+6−13
@@ -15,19 +15,12 @@ Module {
1515 isSingleton: true
1616 exportMetaObjectRevisions: [0]
1717 Enum {
18− name: "DisplayFlag"
18+ name: "DisplayStateChangeReason"
1919 values: {
20− "UseProximity": 1,
21− "DisableAutoBrightness": 2,
22− "Bright": 4
23− }
24− }
25− Enum {
26− name: "DisplayFlags"
27− values: {
28− "UseProximity": 1,
29− "DisableAutoBrightness": 2,
30− "Bright": 4
20+ "Unknown": 0,
21+ "Inactivity": 1,
22+ "PowerKey": 2,
23+ "Proximity": 3
3124 }
3225 }
3326 Enum {
@@ -40,7 +33,7 @@ Module {
4033 Signal {
4134 name: "displayPowerStateChange"
4235 Parameter { name: "status"; type: "int" }
43− Parameter { name: "flags"; type: "uint" }
36+ Parameter { name: "reason"; type: "int" }
4437 }
4538 }
4639}
tests/mocks/Unity/Unity.qmltypes+10−2
@@ -89,6 +89,10 @@ Module {
8989 name: "loadDepartment"
9090 Parameter { name: "id"; type: "string" }
9191 }
92+ Method {
93+ name: "performQuery"
94+ Parameter { name: "query"; type: "string" }
95+ }
9296 }
9397 Component {
9498 name: "Scopes"
@@ -133,8 +137,8 @@ Module {
133137 "RoleRawRendererTemplate": 3,
134138 "RoleRenderer": 4,
135139 "RoleComponents": 5,
136− "RoleResults": 6,
137− "RoleCount": 7
140+ "RoleResults": 7,
141+ "RoleCount": 8
138142 }
139143 }
140144 Method {
@@ -179,6 +183,9 @@ Module {
179183 Component {
180184 name: "unity::shell::scopes::PreviewModelInterface"
181185 prototype: "QAbstractListModel"
186+ exports: ["Unity/PreviewModel 0.2"]
187+ isCreatable: false
188+ exportMetaObjectRevisions: [0]
182189 Enum {
183190 name: "Roles"
184191 values: {
@@ -272,6 +279,7 @@ Module {
272279 Property { name: "isActive"; type: "bool" }
273280 Property { name: "currentDepartmentId"; type: "string"; isReadonly: true }
274281 Property { name: "hasDepartments"; type: "bool"; isReadonly: true }
282+ Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }
275283 Signal { name: "showDash" }
276284 Signal { name: "hideDash" }
277285 Signal {