unity-webapps-qml

Merge lp://staging/~abreu-alexandre/unity-webapps-qml/fail-safe-content-hub-bindings into lp://staging/unity-webapps-qml

fail-safe-content-hub-bindings
Merge into trunk

Proposed by Alexandre Abreu on 2014-11-25

Status:

Merged

Approved by:

Alexandre Abreu on 2014-11-27

Approved revision:

139

Merged at revision:

140

Proposed branch:

lp://staging/~abreu-alexandre/unity-webapps-qml/fail-safe-content-hub-bindings

Merge into:

lp://staging/unity-webapps-qml

Diff against target:

49 lines (+19/-4)

2 files modified

src/Ubuntu/UnityWebApps/UnityWebApps.qml (+2/-1)
src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js (+17/-3)

To merge this branch:

bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/fail-safe-content-hub-bindings

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-11-26
Alberto Mardegan (community)		2014-11-25	Approve on 2014-11-26
Review via email: mp+242834@code.staging.launchpad.net

Commit message

Make sure that the content hub bindings are fail safe since the content hub package is a suggests (which is fine since it is not there by default on desktop).

Description of the change

Make sure that the content hub bindings are fail safe since the content hub package is a suggests (which is fine since it is not there by default on desktop).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-25:

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/151/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/5
SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/151/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alberto Mardegan (mardy) wrote on 2014-11-26:

I don't think that you need to import the QtQuick 2.0 module.
Also, I'm not sure if the exception will always be thrown, or if it's possible for Qt.createQmlObject() to return null without raising the exception; if so, you should check for its return value != null as well.

But I'm not sure of either points, so if you have already tested this and this is the correct solution, +1 from me.

review: Approve

Revision history for this message

Alexandre Abreu (abreu-alexandre) wrote on 2014-11-26:

> I don't think that you need to import the QtQuick 2.0 module.

I didn't initially, but it seems to be required to known about QtObject,

> Also, I'm not sure if the exception will always be thrown, or if it's possible
> for Qt.createQmlObject() to return null without raising the exception; if so,
> you should check for its return value != null as well.

> But I'm not sure of either points, so if you have already tested this and this
> is the correct solution, +1 from me.

Revision history for this message

Alexandre Abreu (abreu-alexandre) wrote on 2014-11-26:

> I don't think that you need to import the QtQuick 2.0 module.

I didn't initially, but it seems to be required to known about QtObject,

> But I'm not sure of either points, so if you have already tested this and this
> is the correct solution, +1 from me.

lp://staging/~abreu-alexandre/unity-webapps-qml/fail-safe-content-hub-bindings updated on 2014-11-26