Merge lp:~osomon/webbrowser-app/workaround-empty-toolbar into lp:webbrowser-app

[Olivier Tilloy]

Work around bug #1270848 in a different manner to avoid introducing another regression.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:444
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/589/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2521
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2336
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4779
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3246

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/589/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Working good, tested on the IMDB webapp - toolbar appears, can be revealed and has the back button all the time. Workaround is ok as well.

review: Approve

[David Barth (dbarth)]

works fine as well here, tested with Twitter, Facebook a couple of new click webapps as well: all good, no apparent regressions.

review: Approve

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2014-01-20 15:06:48 +0000
+++ src/app/webcontainer/WebApp.qml	2014-01-22 08:59:25 +0000
@@ -51,9 +51,14 @@
         }
     ]
 
-    Item {
+    Page {
         anchors.fill: parent
 
+        // Work around https://bugs.launchpad.net/webbrowser-app/+bug/1270848 and
+        // https://bugs.launchpad.net/ubuntu/+source/webbrowser-app/+bug/1271436.
+        // The UITK is trying too hard to be clever about the header and toolbar.
+        flickable: null
+
         WebViewImpl {
             id: webview