Merge lp:~osomon/webbrowser-app/search-engines-overlap-header into lp:webbrowser-app

[Olivier Tilloy]

Ensure the search engine delegates do not overlap with the settings header.

[Riccardo Padovani (rpadovani)]

Looks good to me, works as expected. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1012
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1770/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2839/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/527
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/527/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/527
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2431/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2837
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2837/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20526

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/SettingsPage.qml'
--- src/app/webbrowser/SettingsPage.qml	2015-04-22 10:25:56 +0000
+++ src/app/webbrowser/SettingsPage.qml	2015-05-15 09:06:10 +0000
@@ -182,6 +182,7 @@
                         right: parent.right
                         bottom: parent.bottom
                     }
+                    clip: true
 
                     model: searchEngineFolder