Merge lp://staging/~abreu-alexandre/unity-webapps-qml/fix-content-hub-export into lp://staging/unity-webapps-qml
Status: | Merged |
---|---|
Approved by: | Kyle Nitzsche |
Approved revision: | 85 |
Merged at revision: | 78 |
Proposed branch: | lp://staging/~abreu-alexandre/unity-webapps-qml/fix-content-hub-export |
Merge into: | lp://staging/unity-webapps-qml |
Diff against target: |
732 lines (+460/-57) 12 files modified
examples/api-bindings/content-hub-exporter/README (+18/-0) examples/api-bindings/content-hub-exporter/content-hub-html5-exporter.desktop (+8/-0) examples/api-bindings/content-hub-exporter/content-hub-html5-exporter.json (+9/-0) examples/api-bindings/content-hub-exporter/content-hub/content-hub-html5-exporter.json (+5/-0) examples/api-bindings/content-hub-exporter/main.qml.in (+31/-0) examples/api-bindings/content-hub-exporter/manifest.json (+15/-0) examples/api-bindings/content-hub-exporter/www/index.html (+22/-0) examples/api-bindings/content-hub-exporter/www/js/app.js (+28/-0) examples/api-bindings/content-hub/www/index.html (+15/-5) examples/api-bindings/content-hub/www/js/app.js (+99/-42) src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js (+99/-3) src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js (+111/-7) |
To merge this branch: | bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/fix-content-hub-export |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
WebApps | Pending | ||
Review via email: mp+203835@code.staging.launchpad.net |
Commit message
Fix content hub export
Description of the change
(for this you need cordova & the ubuntu-
This is a branch that adds some fixes to support the content hub export.
In order to properly test it, one needs 2 bits: the exporter (click package that declares itself as such) and the importer (that pulls from it).
The 2 bits are located in examples/ and easily identifiable.
so in order to test it *on desktop* (to ease up the process).
bzr branch lp:~abreu-alexandre/unity-webapps-qml/fix-content-hub-export
cd fix-content-
qmake
make
# the next step is a bit drastic we need to install the branch so that the click package
# can use the APIs in its js. One other option is to modify the desktop file of the click
# app to have a QML2_IMPORT_PATH variable in the Exec env that points
# to <yourpath>
sudo make install
cd examples/
<follow the instructions in the README file>
cd ../content-hub
APP_ID=qmlscene qmlscene -I `pwd`/../../../src/ main.qml
from there, you should see at least 2 content hub picture providers: the gallery-app (default), and your click package above (identified by its appId).
select the click package (it should turn red) and click import.
result: you should see the window from the click package that opens shortly after
and the image displayed at the top in it being imported AND that appears in the HTML
of the importer app.
there should be a few logs in the html of both apps along the way.
PASSED: Continuous integration, rev:83 jenkins. qa.ubuntu. com/job/ unity-webapps- qml-ci/ 56/ jenkins. qa.ubuntu. com/job/ unity-webapps- qml-trusty- amd64-ci/ 4 jenkins. qa.ubuntu. com/job/ unity-webapps- qml-trusty- armhf-ci/ 4
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- webapps- qml-ci/ 56/rebuild
http://