Merge lp:~unity-team/unity8/manual-qmltypes into lp:unity8

[Michał Sawicz]

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.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
Prerequisite lp:~nick-dedekind/unity8/move-indicator-qml

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

 * 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

[Michał Sawicz (saviq)]

We'll need to check those .qmltypes files into bzr, and copy/install them along with qmldir, so there's a bit more work involved here.

They should be generated into the source dirs, not binary.

I'll take this over tomorrow morning if you have no objections :).

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:985
http://jenkins.qa.ubuntu.com/job/unity8-ci/3223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1218/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/227/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/317/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2098/console

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

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

On Wed, 2014-06-25 at 22:22 +0000, Michał Sawicz wrote:
> Review: Needs Fixing
>
> We'll need to check those .qmltypes files into bzr, and copy/install them along with qmldir, so there's a bit more work involved here.
>
> They should be generated into the source dirs, not binary.
>
> I'll take this over tomorrow morning if you have no objections :).

Done. :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:986
http://jenkins.qa.ubuntu.com/job/unity8-ci/3224/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/228/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2105/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:987
http://jenkins.qa.ubuntu.com/job/unity8-ci/3226/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/230/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2113/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:987
http://jenkins.qa.ubuntu.com/job/unity8-ci/3229/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/323
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/323/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1563
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2118
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8881

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:989
http://jenkins.qa.ubuntu.com/job/unity8-ci/3233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1242
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/327
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2127
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8887

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Looks good.

Any idea how to prevent people from changing the code and forgetting to update the qmltypes file? Could we think of a simple and fast test that verifies if they're up to date?

review: Needs Information

[Michał Sawicz (saviq)]

On 27.06.2014 11:07, Michael Zanetti wrote:
> Any idea how to prevent people from changing the code and forgetting to update the qmltypes file? Could we think of a simple and fast test that verifies if they're up to date?

This would probably be a pre-commit hook where we'd need to generate
them and compare to what's checked in. We should probably do a bit more
- make test, check whitespace, copyright...

[dobey (dobey)]

> Looks good.
>
> Any idea how to prevent people from changing the code and forgetting to update
> the qmltypes file? Could we think of a simple and fast test that verifies if
> they're up to date?

You'd need to be able to check that the API provided by the plug-in actually changed, outside of building the qmltypes file.

Maybe just add something to the review checklist and rely on that?

[lp:~unity-team/unity8/manual-qmltypes]

990. By Michał Sawicz on 2014-06-27

Merge trunk.

991. By Michał Sawicz on 2014-07-08

Merge trunk.

992. By Michał Sawicz on 2014-07-08

Update qmltypes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:992
http://jenkins.qa.ubuntu.com/job/unity8-ci/3358/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/452
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/452/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2711
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2711/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9446

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Oups, this got merged with lp:~unity-team/unity8/payments-button :|

But not the whole of it, so this still needs a review.

[lp:~unity-team/unity8/manual-qmltypes]

993. By Michał Sawicz on 2014-07-10

Merge trunk

994. By Michał Sawicz on 2014-07-10

Update qmltypes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:994
http://jenkins.qa.ubuntu.com/job/unity8-ci/3386/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1794/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/480
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/480/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/480
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2057/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2871
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2871/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9609

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Isn't there any ways can automate this? Doesn't need to be at build time... But reviewing such branches feels just wrong. There's no way we could possibly keep things up to date.

And no, putting it into the checklist doesn't work IMO.

review: Needs Information

[Michael Zanetti (mzanetti)]

approving as we need this in any case...

review: Approve

=== added file 'plugins/Lights/Lights.qmltypes'
--- plugins/Lights/Lights.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Lights/Lights.qmltypes	2014-07-10 10:59:23 +0000
@@ -0,0 +1,45 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Lights 0.1 plugins'
+
+Module {
+    Component {
+        name: "Lights"
+        prototype: "QObject"
+        exports: ["Lights/Lights 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "State"
+            values: {
+                "Off": 0,
+                "On": 1
+            }
+        }
+        Property { name: "state"; type: "State" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "onMillisec"; type: "int" }
+        Property { name: "offMillisec"; type: "int" }
+        Signal {
+            name: "stateChanged"
+            Parameter { name: "newState"; type: "State" }
+        }
+        Signal {
+            name: "colorChanged"
+            Parameter { name: "color"; type: "QColor" }
+        }
+        Signal {
+            name: "onMillisecChanged"
+            Parameter { name: "onMs"; type: "int" }
+        }
+        Signal {
+            name: "offMillisecChanged"
+            Parameter { name: "offMs"; type: "int" }
+        }
+    }
+}

=== modified file 'plugins/Powerd/Powerd.qmltypes'
--- plugins/Powerd/Powerd.qmltypes	2014-06-26 07:47:57 +0000
+++ plugins/Powerd/Powerd.qmltypes	2014-07-10 10:59:23 +0000
@@ -15,19 +15,12 @@
         isSingleton: true
         exportMetaObjectRevisions: [0]
         Enum {
-            name: "DisplayFlag"
-            values: {
-                "UseProximity": 1,
-                "DisableAutoBrightness": 2,
-                "Bright": 4
-            }
-        }
-        Enum {
-            name: "DisplayFlags"
-            values: {
-                "UseProximity": 1,
-                "DisableAutoBrightness": 2,
-                "Bright": 4
+            name: "DisplayStateChangeReason"
+            values: {
+                "Unknown": 0,
+                "Inactivity": 1,
+                "PowerKey": 2,
+                "Proximity": 3
             }
         }
         Enum {
@@ -40,7 +33,7 @@
         Signal {
             name: "displayPowerStateChange"
             Parameter { name: "status"; type: "int" }
-            Parameter { name: "flags"; type: "uint" }
+            Parameter { name: "reason"; type: "int" }
         }
     }
 }

=== modified file 'plugins/Ubuntu/Gestures/Gestures.qmltypes'
--- plugins/Ubuntu/Gestures/Gestures.qmltypes	2014-06-26 07:47:57 +0000
+++ plugins/Ubuntu/Gestures/Gestures.qmltypes	2014-07-10 10:59:23 +0000
@@ -141,6 +141,7 @@
             name: "touchSceneYChanged"
             Parameter { name: "value"; type: "double" }
         }
+        Signal { name: "tapped" }
     }
     Component {
         name: "PressedOutsideNotifier"

=== modified file 'tests/mocks/Powerd/Powerd.qmltypes'
--- tests/mocks/Powerd/Powerd.qmltypes	2014-06-26 07:47:57 +0000
+++ tests/mocks/Powerd/Powerd.qmltypes	2014-07-10 10:59:23 +0000
@@ -15,19 +15,12 @@
         isSingleton: true
         exportMetaObjectRevisions: [0]
         Enum {
-            name: "DisplayFlag"
-            values: {
-                "UseProximity": 1,
-                "DisableAutoBrightness": 2,
-                "Bright": 4
-            }
-        }
-        Enum {
-            name: "DisplayFlags"
-            values: {
-                "UseProximity": 1,
-                "DisableAutoBrightness": 2,
-                "Bright": 4
+            name: "DisplayStateChangeReason"
+            values: {
+                "Unknown": 0,
+                "Inactivity": 1,
+                "PowerKey": 2,
+                "Proximity": 3
             }
         }
         Enum {
@@ -40,7 +33,7 @@
         Signal {
             name: "displayPowerStateChange"
             Parameter { name: "status"; type: "int" }
-            Parameter { name: "flags"; type: "uint" }
+            Parameter { name: "reason"; type: "int" }
         }
     }
 }

=== modified file 'tests/mocks/Unity/Unity.qmltypes'
--- tests/mocks/Unity/Unity.qmltypes	2014-06-26 07:47:57 +0000
+++ tests/mocks/Unity/Unity.qmltypes	2014-07-10 10:59:23 +0000
@@ -89,6 +89,10 @@
             name: "loadDepartment"
             Parameter { name: "id"; type: "string" }
         }
+        Method {
+            name: "performQuery"
+            Parameter { name: "query"; type: "string" }
+        }
     }
     Component {
         name: "Scopes"
@@ -133,8 +137,8 @@
                 "RoleRawRendererTemplate": 3,
                 "RoleRenderer": 4,
                 "RoleComponents": 5,
-                "RoleResults": 6,
-                "RoleCount": 7
+                "RoleResults": 7,
+                "RoleCount": 8
             }
         }
         Method {
@@ -179,6 +183,9 @@
     Component {
         name: "unity::shell::scopes::PreviewModelInterface"
         prototype: "QAbstractListModel"
+        exports: ["Unity/PreviewModel 0.2"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Roles"
             values: {
@@ -272,6 +279,7 @@
         Property { name: "isActive"; type: "bool" }
         Property { name: "currentDepartmentId"; type: "string"; isReadonly: true }
         Property { name: "hasDepartments"; type: "bool"; isReadonly: true }
+        Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }
         Signal { name: "showDash" }
         Signal { name: "hideDash" }
         Signal {