Merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/rtm-fix-webkit-launch into lp://staging/ubuntu-html5-theme/rtm-14.09
| Status: | Merged |
|---|---|
| Approved by: | Alexandre Abreu |
| Approved revision: | 185 |
| Merged at revision: | 184 |
| Proposed branch: | lp://staging/~abreu-alexandre/ubuntu-html5-theme/rtm-fix-webkit-launch |
| Merge into: | lp://staging/ubuntu-html5-theme/rtm-14.09 |
| Diff against target: |
572 lines (+141/-325) 14 files modified
CMakeLists.txt (+4/-0) debian/ubuntu-html5-container.install (+0/-1) src/CMakeLists.txt (+1/-1) src/plugin/CMakeLists.txt (+0/-1) src/plugin/Ubuntu/CMakeLists.txt (+0/-1) src/plugin/Ubuntu/WebApps/CMakeLists.txt (+0/-25) src/plugin/Ubuntu/WebApps/CordovaLoader.qml (+0/-91) src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml (+0/-59) src/plugin/Ubuntu/WebApps/WebAppContainer.qml (+0/-137) src/plugin/Ubuntu/WebApps/qmldir (+0/-2) src/ubuntu-html5-app-launcher/CMakeLists.txt (+0/-1) src/ubuntu-html5-app-launcher/UbuntuJavascriptBindings.qml (+59/-0) src/ubuntu-html5-app-launcher/main.cpp (+4/-1) src/ubuntu-html5-app-launcher/main.qml (+73/-5) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/rtm-fix-webkit-launch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu HTML5 Theme Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Mitigate the QtWebkit / Mainview issue
Description of the change
QtWebkit w/ Qt 5.3 seems to have a race when bundled w/ certain qml elements, something like e.g.:
MainView {
Page { WebView {} }
}
makes the app (launched as a click) on the devices (w/ RTM or Vivid) spin at startup w/o ever actually showing something,
It does that usually on the first launch, subsequent launches usually work fine. Things do work fine when the Webview is replaced by a Window or even an Item. After some strace and investigation it seems that some bits are racy in QtWebkit in relation w/ its ~/.local/share content.
In the behavior described above, the app goes back into failing mode when one deletes the apps' ~/.local/share. Some cookie DB creation errors (that are not seen consistently though) seem to backup the hypothesis above,
