Merge lp:~saviq/qtmir/openurl-keep-bytearray into lp:qtmir

[Michał Sawicz]

Declare the QByteArray in callDispatcher so it doesn't get deleted before it's copied.

[Gerry Boland (gerboland)]

Looks reasonable, as the temporary QByteArray had gone out of scope by the time url_dispatch_send fired.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/qtmir-ci/190/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/41/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/190/rebuild

review: Approve (continuous-integration)

=== modified file 'src/platforms/mirserver/services.cpp'
--- src/platforms/mirserver/services.cpp	2014-06-16 18:29:36 +0000
+++ src/platforms/mirserver/services.cpp	2015-01-09 22:18:11 +0000
@@ -17,6 +17,7 @@
 #include "services.h"
 
 #include <QUrl>
+#include <QByteArray>
 
 #include <url-dispatcher.h>
 
@@ -32,7 +33,8 @@
 
 bool Services::callDispatcher(const QUrl &qUrl)
 {
-    const char *url = qUrl.toEncoded().constData();
+    QByteArray encoded = qUrl.toEncoded();
+    const char *url = encoded.constData();
 
     url_dispatch_send(url, nullptr /*dispatch_callback*/, nullptr /*callback_data*/);