Merge lp:~osomon/webbrowser-app/fix-main-page-dimensions into lp:webbrowser-app

[Olivier Tilloy]

Ensure the main page that contains the webviews fills the main view.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:548
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/835/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/555
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/904
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6753
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7726

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

review: Approve (continuous-integration)

[lp:~osomon/webbrowser-app/fix-main-page-dimensions]

549. By Olivier Tilloy on 2014-05-26

Merge the latest changes from trunk and resolve a conflict.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:549
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/836/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/422
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/35
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/560
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/560/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/912
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/912/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6754
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7732

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2014-05-26 10:54:13 +0000
+++ src/app/webbrowser/Browser.qml	2014-05-26 13:25:47 +0000
@@ -60,8 +60,10 @@
         // Work around http://pad.lv/1305834 by forcing the page title to be
         // reset to an empty string when the activity view is being hidden.
         title: activityViewVisible ? " " : ""
+        anchors.fill: parent
         visible: !activityViewVisible
         active: visible
+
         Item {
             id: webviewContainer
             anchors {