Merge lp://qastaging/~osomon/oxide/renderProcessGone into lp://qastaging/~oxide-developers/oxide/oxide.trunk
Proposed by
Olivier Tilloy
Status: | Merged |
---|---|
Merged at revision: | 1064 |
Proposed branch: | lp://qastaging/~osomon/oxide/renderProcessGone |
Merge into: | lp://qastaging/~oxide-developers/oxide/oxide.trunk |
Diff against target: |
393 lines (+173/-2) 12 files modified
qt/core/browser/oxide_qt_web_view.cc (+21/-0) qt/core/browser/oxide_qt_web_view.h (+4/-0) qt/core/glue/oxide_qt_web_view_proxy.h (+8/-0) qt/core/glue/oxide_qt_web_view_proxy_client.h (+2/-0) qt/qmlplugin/oxide_qml_plugin.cc (+2/-0) qt/quick/api/oxideqquickwebview.cc (+22/-0) qt/quick/api/oxideqquickwebview_p.h (+12/-0) qt/quick/api/oxideqquickwebview_p_p.h (+1/-0) qt/tests/qmltests/api/tst_WebView_webProcessStatus.qml (+40/-0) qt/tests/qmltests/oxide_qml_testing_plugin.cc (+49/-1) shared/browser/oxide_web_view.cc (+9/-1) shared/browser/oxide_web_view.h (+3/-0) |
To merge this branch: | bzr merge lp://qastaging/~osomon/oxide/renderProcessGone |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Coulson | Approve | ||
Review via email: mp+257693@code.qastaging.launchpad.net |
Commit message
Add a WebView:
To post a comment you must log in.
Added quick comment...