Merge lp:~osomon/webbrowser-app/fix-gcc5-ftbfs into lp:webbrowser-app

[Olivier Tilloy]

Fix narrowing conversion that makes the build fail with GCC 5.

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1103
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2001/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/755
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/755
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/755/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/755
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3477
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3477/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22149

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

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looks good to me too.

review: Approve

=== modified file 'tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp'
--- tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2015-05-26 21:42:54 +0000
+++ tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp	2015-07-27 15:35:08 +0000
@@ -34,7 +34,7 @@
 // local
 #include "favicon-fetcher.h"
 
-const char icon_data[] = {
+const unsigned char icon_data[] = {
     0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x00,
     0x01, 0x00, 0x38, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x28, 0x00,
     0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00,
@@ -98,7 +98,7 @@
             response << "HTTP/1.0 200 OK\r\n"
                      << "Content-Length: " << icon_data_size << "\r\n"
                      << "Content-Type: image/x-icon\r\n\r\n"
-                     << QString::fromLocal8Bit(icon_data, icon_data_size) << "\n";
+                     << QString::fromLocal8Bit((const char*) icon_data, icon_data_size) << "\n";
         } else if (redirection.exactMatch(path)) {
             int n = redirection.cap(1).toInt();
             response << "HTTP/1.0 303 See Other\r\n"