Merge lp:~osomon/webbrowser-app/fix-webview-height-landscape into lp:webbrowser-app

[Olivier Tilloy]

Fix the height of the webview container when in landscape orientation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:375
http://10.97.0.26:8080/job/webbrowser-app-ci/469/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-saucy/4719
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-touch/2536
    SUCCESS: http://10.97.0.26:8080/job/webbrowser-app-saucy-amd64-ci/353
    SUCCESS: http://10.97.0.26:8080/job/webbrowser-app-saucy-armhf-ci/352
        deb: http://10.97.0.26:8080/job/webbrowser-app-saucy-armhf-ci/352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/webbrowser-app-saucy-i386-ci/352
    SUCCESS: http://10.97.0.26:8080/job/autopilot-testrunner-otto-saucy/903
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/594
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/594/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2538
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-maguro/2090
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-mako/2103

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webbrowser-app-ci/469/rebuild

review: Approve (continuous-integration)

[David Barth (dbarth)]

looks *awesome* to me :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://10.97.0.26:8080/job/webbrowser-app-autolanding/315/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-saucy/4723
    FAILURE: http://10.97.0.26:8080/job/generic-mediumtests-touch/2541/console
    SUCCESS: http://10.97.0.26:8080/job/webbrowser-app-saucy-amd64-autolanding/259
    SUCCESS: http://10.97.0.26:8080/job/webbrowser-app-saucy-armhf-autolanding/259
        deb: http://10.97.0.26:8080/job/webbrowser-app-saucy-armhf-autolanding/259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/webbrowser-app-saucy-i386-autolanding/259
    SUCCESS: http://10.97.0.26:8080/job/autopilot-testrunner-otto-saucy/907
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/598
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/598/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2543
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2543/artifact/work/output/*zip*/output.zip
    FAILURE: http://10.97.0.26:8080/job/generic-mediumtests-runner-maguro/2095/console
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-mako/2108

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/app/Browser.qml'
--- src/app/Browser.qml	2013-10-04 09:44:35 +0000
+++ src/app/Browser.qml	2013-10-07 14:03:23 +0000
@@ -126,7 +126,7 @@
                     right: parent.right
                     top: parent.top
                 }
-                height: browser.height - osk.height
+                height: parent.height - osk.height
             }
 
             ErrorSheet {