Merge lp:~osomon/webbrowser-app/webkitdpr-patch-not-mandatory into lp:webbrowser-app

[Olivier Tilloy]

Allow running with stock QtWebKit as found in Ubuntu,
by not trying to set the 'WebView.experimental.devicePixelRatio' property if it doesn’t exist.

We don’t have the patched webkit (that adds the 'WebView.experimental.devicePixelRatio' property) built in the phablet-team PPA for raring at the moment, so the browser won’t run on a raring desktop at the moment.

This branch relaxes the hard dependency on said patch, thus slightly degrading the functionality, but allowing to run anyway.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-armhf-ci/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-quantal-i386-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-raring-i386-ci/11
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/392

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

The code is fairly straightforward and looks good to me.
Works on desktop (quantal).

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Browser/Browser.qml'
--- src/Ubuntu/Browser/Browser.qml	2013-03-25 17:43:06 +0000
+++ src/Ubuntu/Browser/Browser.qml	2013-03-27 11:25:46 +0000
@@ -128,7 +128,6 @@
             }
         }
 
-        experimental.devicePixelRatio: browser.qtwebkitdpr
         experimental.preferences.developerExtrasEnabled: browser.developerExtrasEnabled
         experimental.preferences.navigatorQtObjectEnabled: true
         experimental.userScripts: [Qt.resolvedUrl("hyperlinks.js"),
@@ -184,6 +183,13 @@
         }
     }
 
+    onQtwebkitdprChanged: {
+        // Do not make this patch to QtWebKit a hard requirement.
+        if (webview.experimental.hasOwnProperty('devicePixelRatio')) {
+            webview.experimental.devicePixelRatio = qtwebkitdpr
+        }
+    }
+
     Selection {
         id: selection