Unity 8

Merge lp:~saviq/unity8/update-qmltypes into lp:unity8

  1. update-qmltypes
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1150
Merged at revision: 1164
Proposed branch: lp:~saviq/unity8/update-qmltypes
Merge into: lp:unity8
Diff against target: 503 lines (+321/-8)
12 files modified
plugins/AccountsService/AccountsService.qmltypes (+8/-0)
plugins/Dash/Dash.qmltypes (+1/-0)
plugins/LightDM/LightDM.qmltypes (+7/-0)
plugins/Unity/DashCommunicator/DashCommunicator.qmltypes (+34/-0)
plugins/Unity/Session/Session.qmltypes (+12/-0)
plugins/Utils/Utils.qmltypes (+7/-0)
tests/mocks/AccountsService/AccountsService.qmltypes (+8/-0)
tests/mocks/LightDM/LightDM.qmltypes (+7/-0)
tests/mocks/QMenuModel/QMenuModel.qmltypes (+1/-0)
tests/mocks/Ubuntu/Telephony/Telephony.qmltypes (+57/-0)
tests/mocks/Unity/Application/Application.qmltypes (+133/-8)
tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes (+46/-0)
To merge this branch: bzr merge lp:~saviq/unity8/update-qmltypes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michael Zanetti (community) Approve
Review via email: mp+230737@code.launchpad.net

Commit message

Update qmltypes definitions

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No code changes, just qmltypes.

 * Did you make sure that your branch does not contain spurious tags?
Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1149
http://jenkins.qa.ubuntu.com/job/unity8-ci/3897/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3518
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/991
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/991/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4765
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4765/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11441

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3897/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Not sure if it should be fixed in this MP or not, but reading through it I noticed a few issues:

* ApplicationInfo.cpp still has signals where the properties are gone
* DashCommunicator plugin doesn't seem to generate qmltypes info (my fault, I know).

I guess the DashCommunicator one could be fixed in here... The ApplicationManager one probably a separate one.

review: Needs Information
lp:~saviq/unity8/update-qmltypes updated
1150. By Michał Sawicz

Add missing qmltypes

Revision history for this message
Michał Sawicz (saviq) wrote :

> I guess the DashCommunicator one could be fixed in here...

Done

 > The ApplicationManager one probably a separate one.
Yeah, especially since this needs fixin' in unity-api.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

> > I guess the DashCommunicator one could be fixed in here...
>
> Done
>
> > The ApplicationManager one probably a separate one.
> Yeah, especially since this needs fixin' in unity-api.

Actually it doesn't... This is just leftovers still from the old unity-mir way of doing things, but only needed in the mocks. Anyways, still a different topic.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

ack. looking good!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1150
http://jenkins.qa.ubuntu.com/job/unity8-ci/3911/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3554
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/912/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1005
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1005/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4801
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11495

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3911/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/AccountsService/AccountsService.qmltypes'
2--- plugins/AccountsService/AccountsService.qmltypes 2014-06-26 07:47:57 +0000
3+++ plugins/AccountsService/AccountsService.qmltypes 2014-08-14 13:33:37 +0000
4@@ -14,9 +14,17 @@
5 isCreatable: false
6 isSingleton: true
7 exportMetaObjectRevisions: [0]
8+ Enum {
9+ name: "PasswordDisplayHint"
10+ values: {
11+ "Keyboard": 0,
12+ "Numeric": 1
13+ }
14+ }
15 Property { name: "user"; type: "string" }
16 Property { name: "demoEdges"; type: "bool" }
17 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
18 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
19+ Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
20 }
21 }
22
23=== modified file 'plugins/Dash/Dash.qmltypes'
24--- plugins/Dash/Dash.qmltypes 2014-06-26 07:47:57 +0000
25+++ plugins/Dash/Dash.qmltypes 2014-08-14 13:33:37 +0000
26@@ -39,6 +39,7 @@
27 Property { name: "sectionProperty"; type: "string" }
28 Property { name: "forceNoClip"; type: "bool" }
29 Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }
30+ Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }
31 Signal { name: "headerChanged" }
32 Method { name: "positionAtBeginning" }
33 Method { name: "showHeader" }
34
35=== modified file 'plugins/LightDM/LightDM.qmltypes'
36--- plugins/LightDM/LightDM.qmltypes 2014-06-26 07:47:57 +0000
37+++ plugins/LightDM/LightDM.qmltypes 2014-08-14 13:33:37 +0000
38@@ -14,6 +14,7 @@
39 isCreatable: false
40 isSingleton: true
41 exportMetaObjectRevisions: [0]
42+ Property { name: "active"; type: "bool" }
43 Property { name: "authenticated"; type: "bool"; isReadonly: true }
44 Property { name: "authenticationUser"; type: "string"; isReadonly: true }
45 Property { name: "promptless"; type: "bool"; isReadonly: true }
46@@ -32,6 +33,8 @@
47 name: "authenticationUserChanged"
48 Parameter { name: "user"; type: "string" }
49 }
50+ Signal { name: "isActiveChanged" }
51+ Signal { name: "showGreeter" }
52 Signal {
53 name: "requestAuthenticationUser"
54 Parameter { name: "user"; type: "string" }
55@@ -51,6 +54,10 @@
56 Parameter { name: "session"; type: "string" }
57 }
58 Method { name: "startSessionSync"; type: "bool" }
59+ Method {
60+ name: "setIsActive"
61+ Parameter { name: "isActive"; type: "bool" }
62+ }
63 }
64 Component {
65 name: "QAbstractProxyModel"
66
67=== added file 'plugins/Unity/DashCommunicator/DashCommunicator.qmltypes'
68--- plugins/Unity/DashCommunicator/DashCommunicator.qmltypes 1970-01-01 00:00:00 +0000
69+++ plugins/Unity/DashCommunicator/DashCommunicator.qmltypes 2014-08-14 13:33:37 +0000
70@@ -0,0 +1,34 @@
71+import QtQuick.tooling 1.1
72+
73+// This file describes the plugin-supplied types contained in the library.
74+// It is used for QML tooling purposes only.
75+//
76+// This file was auto-generated by:
77+// 'qmlplugindump -notrelocatable Unity.DashCommunicator 0.1 plugins'
78+
79+Module {
80+ Component {
81+ name: "DashCommunicator"
82+ prototype: "QObject"
83+ exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]
84+ exportMetaObjectRevisions: [0]
85+ Method {
86+ name: "setCurrentScope"
87+ Parameter { name: "scopeId"; type: "string" }
88+ Parameter { name: "animate"; type: "bool" }
89+ Parameter { name: "reset"; type: "bool" }
90+ }
91+ }
92+ Component {
93+ name: "DashCommunicatorService"
94+ prototype: "QObject"
95+ exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]
96+ exportMetaObjectRevisions: [0]
97+ Signal {
98+ name: "setCurrentScopeRequested"
99+ Parameter { name: "scopeId"; type: "string" }
100+ Parameter { name: "animate"; type: "bool" }
101+ Parameter { name: "reset"; type: "bool" }
102+ }
103+ }
104+}
105
106=== modified file 'plugins/Unity/Session/Session.qmltypes'
107--- plugins/Unity/Session/Session.qmltypes 2014-06-26 07:47:57 +0000
108+++ plugins/Unity/Session/Session.qmltypes 2014-08-14 13:33:37 +0000
109@@ -18,8 +18,20 @@
110 name: "logoutRequested"
111 Parameter { name: "have_inhibitors"; type: "bool" }
112 }
113+ Signal {
114+ name: "rebootRequested"
115+ Parameter { name: "have_inhibitors"; type: "bool" }
116+ }
117+ Signal {
118+ name: "shutdownRequested"
119+ Parameter { name: "have_inhibitors"; type: "bool" }
120+ }
121 Signal { name: "logoutReady" }
122 Method { name: "Logout" }
123+ Method { name: "Reboot" }
124+ Method { name: "Shutdown" }
125 Method { name: "RequestLogout" }
126+ Method { name: "RequestReboot" }
127+ Method { name: "RequestShutdown" }
128 }
129 }
130
131=== modified file 'plugins/Utils/Utils.qmltypes'
132--- plugins/Utils/Utils.qmltypes 2014-06-26 07:47:57 +0000
133+++ plugins/Utils/Utils.qmltypes 2014-08-14 13:33:37 +0000
134@@ -140,4 +140,11 @@
135 Property { name: "actionsHint"; type: "QByteArray" }
136 Property { name: "menuObjectPathHint"; type: "QByteArray" }
137 }
138+ Component {
139+ name: "WindowKeysFilter"
140+ defaultProperty: "data"
141+ prototype: "QQuickItem"
142+ exports: ["Utils/WindowKeysFilter 0.1"]
143+ exportMetaObjectRevisions: [0]
144+ }
145 }
146
147=== modified file 'tests/mocks/AccountsService/AccountsService.qmltypes'
148--- tests/mocks/AccountsService/AccountsService.qmltypes 2014-06-26 07:47:57 +0000
149+++ tests/mocks/AccountsService/AccountsService.qmltypes 2014-08-14 13:33:37 +0000
150@@ -14,9 +14,17 @@
151 isCreatable: false
152 isSingleton: true
153 exportMetaObjectRevisions: [0]
154+ Enum {
155+ name: "PasswordDisplayHint"
156+ values: {
157+ "Keyboard": 0,
158+ "Numeric": 1
159+ }
160+ }
161 Property { name: "user"; type: "string" }
162 Property { name: "demoEdges"; type: "bool" }
163 Property { name: "backgroundFile"; type: "string" }
164 Property { name: "statsWelcomeScreen"; type: "bool" }
165+ Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
166 }
167 }
168
169=== modified file 'tests/mocks/LightDM/LightDM.qmltypes'
170--- tests/mocks/LightDM/LightDM.qmltypes 2014-06-26 07:47:57 +0000
171+++ tests/mocks/LightDM/LightDM.qmltypes 2014-08-14 13:33:37 +0000
172@@ -14,6 +14,7 @@
173 isCreatable: false
174 isSingleton: true
175 exportMetaObjectRevisions: [0]
176+ Property { name: "active"; type: "bool" }
177 Property { name: "authenticated"; type: "bool"; isReadonly: true }
178 Property { name: "authenticationUser"; type: "string"; isReadonly: true }
179 Property { name: "promptless"; type: "bool"; isReadonly: true }
180@@ -32,6 +33,8 @@
181 name: "authenticationUserChanged"
182 Parameter { name: "user"; type: "string" }
183 }
184+ Signal { name: "isActiveChanged" }
185+ Signal { name: "showGreeter" }
186 Signal {
187 name: "requestAuthenticationUser"
188 Parameter { name: "user"; type: "string" }
189@@ -51,6 +54,10 @@
190 Parameter { name: "session"; type: "string" }
191 }
192 Method { name: "startSessionSync"; type: "bool" }
193+ Method {
194+ name: "setIsActive"
195+ Parameter { name: "isActive"; type: "bool" }
196+ }
197 }
198 Component {
199 name: "QAbstractProxyModel"
200
201=== modified file 'tests/mocks/QMenuModel/QMenuModel.qmltypes'
202--- tests/mocks/QMenuModel/QMenuModel.qmltypes 2014-06-26 07:47:57 +0000
203+++ tests/mocks/QMenuModel/QMenuModel.qmltypes 2014-08-14 13:33:37 +0000
204@@ -23,6 +23,7 @@
205 Property { name: "actions"; type: "QVariantMap" }
206 Property { name: "menuObjectPath"; type: "QByteArray" }
207 Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }
208+ Property { name: "nameOwner"; type: "string"; isReadonly: true }
209 Method {
210 name: "insertRow"
211 Parameter { name: "row"; type: "int" }
212
213=== added file 'tests/mocks/Ubuntu/Telephony/Telephony.qmltypes'
214--- tests/mocks/Ubuntu/Telephony/Telephony.qmltypes 1970-01-01 00:00:00 +0000
215+++ tests/mocks/Ubuntu/Telephony/Telephony.qmltypes 2014-08-14 13:33:37 +0000
216@@ -0,0 +1,57 @@
217+import QtQuick.tooling 1.1
218+
219+// This file describes the plugin-supplied types contained in the library.
220+// It is used for QML tooling purposes only.
221+//
222+// This file was auto-generated by:
223+// 'qmlplugindump -notrelocatable Ubuntu.Telephony 0.1 tests/mocks'
224+
225+Module {
226+ Component {
227+ name: "ContactWatcherData"
228+ prototype: "QObject"
229+ exports: ["Ubuntu.Telephony/ContactWatcherData 0.1"]
230+ isCreatable: false
231+ exportMetaObjectRevisions: [0]
232+ Property { name: "contactData"; type: "QVariant" }
233+ }
234+ Component {
235+ name: "MockCallEntry"
236+ prototype: "QObject"
237+ exports: ["Ubuntu.Telephony/CallEntry 0.1"]
238+ exportMetaObjectRevisions: [0]
239+ Property { name: "phoneNumber"; type: "string" }
240+ Property { name: "isConference"; type: "bool" }
241+ Property { name: "elapsedTime"; type: "int"; isReadonly: true }
242+ }
243+ Component {
244+ name: "MockCallManager"
245+ prototype: "QObject"
246+ exports: ["Ubuntu.Telephony/CallManager 0.1"]
247+ isCreatable: false
248+ exportMetaObjectRevisions: [0]
249+ Property { name: "foregroundCall"; type: "QObject"; isPointer: true }
250+ Property { name: "backgroundCall"; type: "QObject"; isPointer: true }
251+ Property { name: "hasCalls"; type: "bool"; isReadonly: true }
252+ Property { name: "callIndicatorVisible"; type: "bool" }
253+ }
254+ Component {
255+ name: "MockContactWatcher"
256+ prototype: "QObject"
257+ exports: ["Ubuntu.Telephony/ContactWatcher 0.1"]
258+ exportMetaObjectRevisions: [0]
259+ Property { name: "phoneNumber"; type: "string" }
260+ Property { name: "alias"; type: "string"; isReadonly: true }
261+ }
262+ Component {
263+ name: "MockTelepathyHelper"
264+ prototype: "QObject"
265+ exports: ["Ubuntu.Telephony/TelepathyHelper 0.1"]
266+ isCreatable: false
267+ exportMetaObjectRevisions: [0]
268+ Method {
269+ name: "registerChannelObserver"
270+ Parameter { name: "name"; type: "string" }
271+ }
272+ }
273+}
274
275=== modified file 'tests/mocks/Unity/Application/Application.qmltypes'
276--- tests/mocks/Unity/Application/Application.qmltypes 2014-07-23 16:56:16 +0000
277+++ tests/mocks/Unity/Application/Application.qmltypes 2014-08-14 13:33:37 +0000
278@@ -33,15 +33,58 @@
279 exportMetaObjectRevisions: [0]
280 Property { name: "fullscreen"; type: "bool" }
281 Property { name: "stage"; type: "Stage" }
282+ Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }
283+ Property { name: "promptSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }
284 Property { name: "imageQml"; type: "string" }
285 Property { name: "windowQml"; type: "string" }
286- Signal { name: "appIdChanged" }
287- Signal { name: "nameChanged" }
288- Signal { name: "commentChanged" }
289- Signal { name: "iconChanged" }
290- Signal { name: "stateChanged" }
291- Signal { name: "focusedChanged" }
292- Signal { name: "screenshotChanged" }
293+ Signal {
294+ name: "appIdChanged"
295+ Parameter { type: "string" }
296+ }
297+ Signal {
298+ name: "nameChanged"
299+ Parameter { type: "string" }
300+ }
301+ Signal {
302+ name: "commentChanged"
303+ Parameter { type: "string" }
304+ }
305+ Signal {
306+ name: "iconChanged"
307+ Parameter { type: "QUrl" }
308+ }
309+ Signal {
310+ name: "stageChanged"
311+ Parameter { type: "Stage" }
312+ }
313+ Signal {
314+ name: "stateChanged"
315+ Parameter { type: "State" }
316+ }
317+ Signal {
318+ name: "focusedChanged"
319+ Parameter { type: "bool" }
320+ }
321+ Signal {
322+ name: "fullscreenChanged"
323+ Parameter { type: "bool" }
324+ }
325+ Signal {
326+ name: "imageQmlChanged"
327+ Parameter { type: "string" }
328+ }
329+ Signal {
330+ name: "windowQmlChanged"
331+ Parameter { type: "string" }
332+ }
333+ Signal {
334+ name: "screenshotChanged"
335+ Parameter { type: "QUrl" }
336+ }
337+ Signal {
338+ name: "surfaceChanged"
339+ Parameter { type: "MirSurfaceItem"; isPointer: true }
340+ }
341 }
342 Component {
343 name: "ApplicationManager"
344@@ -102,11 +145,11 @@
345 "ForceMainStage": 1
346 }
347 }
348+ Property { name: "empty"; type: "bool"; isReadonly: true }
349 Property { name: "sideStageWidth"; type: "int"; isReadonly: true }
350 Property { name: "stageHint"; type: "StageHint"; isReadonly: true }
351 Property { name: "formFactorHint"; type: "FormFactorHint"; isReadonly: true }
352 Property { name: "fake"; type: "bool"; isReadonly: true }
353- Property { name: "rightMargin"; type: "int" }
354 Signal {
355 name: "focusRequested"
356 Parameter { name: "favoriteApplication"; type: "FavoriteApplication" }
357@@ -115,6 +158,10 @@
358 name: "focusRequested"
359 Parameter { name: "appId"; type: "string" }
360 }
361+ Signal {
362+ name: "emptyChanged"
363+ Parameter { name: "empty"; type: "bool" }
364+ }
365 Method {
366 name: "get"
367 type: "ApplicationInfo*"
368@@ -178,6 +225,84 @@
369 Method { name: "availableApplications"; type: "QStringList" }
370 }
371 Component {
372+ name: "MirSurfaceItem"
373+ defaultProperty: "data"
374+ prototype: "QQuickPaintedItem"
375+ exports: ["Unity.Application/MirSurfaceItem 0.1"]
376+ isCreatable: false
377+ exportMetaObjectRevisions: [0]
378+ Enum {
379+ name: "Type"
380+ values: {
381+ "Normal": 0,
382+ "Utility": 1,
383+ "Dialog": 2,
384+ "Overlay": 3,
385+ "Freestyle": 4,
386+ "Popover": 5,
387+ "InputMethod": 6
388+ }
389+ }
390+ Enum {
391+ name: "State"
392+ values: {
393+ "Unknown": 0,
394+ "Restored": 1,
395+ "Minimized": 2,
396+ "Maximized": 3,
397+ "VertMaximized": 4,
398+ "Fullscreen": 5
399+ }
400+ }
401+ Property { name: "type"; type: "Type"; isReadonly: true }
402+ Property { name: "state"; type: "State"; isReadonly: true }
403+ Property { name: "name"; type: "string"; isReadonly: true }
404+ Property { name: "parentSurface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }
405+ Property { name: "childSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }
406+ Signal {
407+ name: "typeChanged"
408+ Parameter { type: "Type" }
409+ }
410+ Signal {
411+ name: "stateChanged"
412+ Parameter { type: "State" }
413+ }
414+ Signal {
415+ name: "nameChanged"
416+ Parameter { type: "string" }
417+ }
418+ Signal {
419+ name: "parentSurfaceChanged"
420+ Parameter { type: "MirSurfaceItem"; isPointer: true }
421+ }
422+ Signal { name: "removed" }
423+ Signal { name: "inputMethodRequested" }
424+ Signal { name: "inputMethodDismissed" }
425+ Method {
426+ name: "setState"
427+ Parameter { name: "newState"; type: "State" }
428+ }
429+ Method { name: "release" }
430+ }
431+ Component {
432+ name: "SurfaceManager"
433+ prototype: "QObject"
434+ exports: ["Unity.Application/SurfaceManager 0.1"]
435+ isCreatable: false
436+ isSingleton: true
437+ exportMetaObjectRevisions: [0]
438+ Signal { name: "countChanged" }
439+ Signal {
440+ name: "surfaceCreated"
441+ Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }
442+ }
443+ Signal {
444+ name: "surfaceDestroyed"
445+ Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }
446+ }
447+ Method { name: "inputMethodSurface"; type: "MirSurfaceItem*" }
448+ }
449+ Component {
450 name: "unity::shell::application::ApplicationInfoInterface"
451 prototype: "QObject"
452 exports: ["Unity.Application/ApplicationInfoInterface 0.1"]
453
454=== added file 'tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes'
455--- tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes 1970-01-01 00:00:00 +0000
456+++ tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes 2014-08-14 13:33:37 +0000
457@@ -0,0 +1,46 @@
458+import QtQuick.tooling 1.1
459+
460+// This file describes the plugin-supplied types contained in the library.
461+// It is used for QML tooling purposes only.
462+//
463+// This file was auto-generated by:
464+// 'qmlplugindump -notrelocatable Unity.DashCommunicator 0.1 tests/mocks'
465+
466+Module {
467+ Component {
468+ name: "DashCommunicator"
469+ prototype: "QObject"
470+ exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]
471+ exportMetaObjectRevisions: [0]
472+ Signal {
473+ name: "setCurrentScopeCalled"
474+ Parameter { name: "scopeId"; type: "string" }
475+ Parameter { name: "animate"; type: "bool" }
476+ Parameter { name: "reset"; type: "bool" }
477+ }
478+ Method {
479+ name: "setCurrentScope"
480+ Parameter { name: "scopeId"; type: "string" }
481+ Parameter { name: "animate"; type: "bool" }
482+ Parameter { name: "reset"; type: "bool" }
483+ }
484+ }
485+ Component {
486+ name: "DashCommunicatorService"
487+ prototype: "QObject"
488+ exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]
489+ exportMetaObjectRevisions: [0]
490+ Signal {
491+ name: "setCurrentScopeRequested"
492+ Parameter { name: "scopeId"; type: "string" }
493+ Parameter { name: "animate"; type: "bool" }
494+ Parameter { name: "reset"; type: "bool" }
495+ }
496+ Method {
497+ name: "mockSetCurrentScope"
498+ Parameter { name: "scopeId"; type: "string" }
499+ Parameter { name: "animate"; type: "bool" }
500+ Parameter { name: "reset"; type: "bool" }
501+ }
502+ }
503+}

Subscribers

People subscribed via source and target branches