Merge lp://staging/~abreu-alexandre/unity-webapps-qml/port-to-oxide into lp://staging/unity-webapps-qml
Proposed by
Alexandre Abreu
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | David Barth | ||||
| Approved revision: | 136 | ||||
| Merged at revision: | 136 | ||||
| Proposed branch: | lp://staging/~abreu-alexandre/unity-webapps-qml/port-to-oxide | ||||
| Merge into: | lp://staging/unity-webapps-qml | ||||
| Diff against target: |
2242 lines (+500/-921) 41 files modified
README (+45/-1) debian/control (+2/-3) examples/api-bindings/alarm/main.qml.in (+9/-10) examples/api-bindings/content-hub-exporter/main.qml.in (+8/-10) examples/api-bindings/content-hub/main.qml.in (+8/-10) examples/api-bindings/content-peer-picker/main.qml.in (+8/-10) examples/api-bindings/download-manager/main.qml.in (+8/-10) examples/api-bindings/online-accounts/main.qml.in (+8/-10) examples/api-bindings/runtime-api/main.qml.in (+7/-9) examples/basic-webview/main.qml (+9/-25) examples/examples.pro (+3/-0) examples/facebook-share/content-hub/webapp-facebook.json (+0/-5) examples/facebook-share/manifest.json (+0/-18) examples/facebook-share/unity-webapps-facebook/HubSharer.qml (+0/-41) examples/facebook-share/unity-webapps-facebook/Share.qml (+0/-323) examples/facebook-share/unity-webapps-facebook/facebook.user.js (+0/-47) examples/facebook-share/unity-webapps-facebook/manifest.json (+0/-7) examples/facebook-share/webapp-facebook.application (+0/-11) examples/facebook-share/webapp-facebook.desktop (+0/-9) examples/facebook-share/webapp-facebook.json (+0/-13) examples/facebook-share/webapp-facebook.service (+0/-6) examples/unity-webapps-example-bbcnews/main.qml (+10/-15) examples/unity-webapps-example-facebookmessenger/main.qml (+9/-12) src/Ubuntu/UnityWebApps/UnityWebApps.js (+1/-2) src/Ubuntu/UnityWebApps/UnityWebApps.qml (+16/-7) src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js (+11/-4) src/Ubuntu/UnityWebApps/common/js/unity-backend-messaging-proxy.js (+1/-1) src/Ubuntu/UnityWebApps/unity-webapps-api.js.in (+4/-0) tests/autopilot/autopilot.pro (+0/-1) tests/autopilot/qml/FullWebViewApp.qml (+12/-35) tests/autopilot/qml/WebviewBackendOxide.qml (+8/-3) tests/autopilot/qml/WebviewBackendWebkit.qml (+0/-19) tests/autopilot/unity_webapps_qml/tests/__init__.py (+50/-35) tests/autopilot/unity_webapps_qml/tests/fake_servers.py (+3/-3) tests/autopilot/unity_webapps_qml/tests/test_callbackDispatch.py (+27/-13) tests/autopilot/unity_webapps_qml/tests/test_hud.py (+0/-81) tests/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py (+52/-23) tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py (+49/-18) tests/autopilot/unity_webapps_qml/tests/test_launcher.py (+52/-28) tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py (+80/-33) tools/qml-launcher/qml-launcher.cpp (+0/-10) |
||||
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/port-to-oxide | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| WebApps | Pending | ||
|
Review via email:
|
|||
Commit message
Port qml bindings to oxide
Description of the change
Port qml bindings to oxide
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:136
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://