Merge lp://staging/~abreu-alexandre/unity-webapps-qml/cleanup-and-fix-bindee-init into lp://staging/unity-webapps-qml
Proposed by
Alexandre Abreu
| Status: | Merged |
|---|---|
| Merged at revision: | 114 |
| Proposed branch: | lp://staging/~abreu-alexandre/unity-webapps-qml/cleanup-and-fix-bindee-init |
| Merge into: | lp://staging/unity-webapps-qml |
| Diff against target: |
696 lines (+170/-87) 21 files modified
src/Ubuntu/UnityWebApps/UnityWebApps.js (+14/-3) src/Ubuntu/UnityWebApps/UnityWebApps.qml (+40/-43) src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js (+1/-1) src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.cpp (+7/-0) src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-manifest-parser.h (+2/-0) src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp (+22/-0) src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h (+9/-1) tests/integration/autopilot/html/test_webapps_api_injected.html (+17/-0) tests/integration/autopilot/html/test_webapps_hud.html (+2/-2) tests/integration/autopilot/qml/FullWebViewApp.qml (+2/-1) tests/integration/autopilot/unity_webapps_qml/tests/__init__.py (+2/-1) tests/integration/autopilot/unity_webapps_qml/tests/test_hud.py (+4/-5) tests/integration/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py (+13/-13) tests/unit/test_plugin/data/manifests/valid-with-ua-override.json (+15/-0) tests/unit/test_plugin/test_plugin.pro (+2/-1) tests/unit/test_plugin/tst_manifestParser.cpp (+8/-0) tests/unit/test_plugin/tst_manifestParser.h (+1/-1) tests/unit/test_qml/tst_cleanup.qml (+4/-5) tests/unit/test_qml/tst_dispatch.qml (+1/-5) tests/unit/test_qml/tst_init.qml (+1/-5) tools/qml-launcher/qml-launcher.cpp (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/unity-webapps-qml/cleanup-and-fix-bindee-init |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| WebApps | Pending | ||
|
Review via email:
|
|||
Commit message
Add UA override capabilities to webapps; clean some code and tests,
Description of the change
Add UA override capabilities to webapps; clean some code and tests,
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:115
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://