From 251a3c50ca89c32678fb51de48124d144155f704 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Thu, 10 Apr 2014 16:35:42 +0200
Subject: Fix cast from QByteArray to QString

QUrl::toEncoded() returns a QByteArray which we should not try to append
directly to a QString. Instead convert it first from ascii/latin1.

Change-Id: I54fd1ef939cf25c81ad4f4ceab91fc4053b627ba
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
---
 Source/WebCore/platform/qt/PasteboardQt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source')

diff --git a/Source/WebCore/platform/qt/PasteboardQt.cpp b/Source/WebCore/platform/qt/PasteboardQt.cpp
index cf1c3a619..7639e2302 100644
--- a/Source/WebCore/platform/qt/PasteboardQt.cpp
+++ b/Source/WebCore/platform/qt/PasteboardQt.cpp
@@ -171,7 +171,7 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP
             if (!title.isEmpty())
                 title = QStringLiteral(" title=\"") + title + QStringLiteral("\"");
             if (urls.count() == 1) {
-                QString html = QStringLiteral("<img src=\"") + urls.first().toEncoded() + QStringLiteral("\"") + title + QStringLiteral(">");
+                QString html = QStringLiteral("<img src=\"") + urls.first().toString(QUrl::FullyEncoded) + QStringLiteral("\"") + title + QStringLiteral(">");
                 RefPtr<DocumentFragment> fragment = createFragmentFromMarkup(frame->document(), html, "", DisallowScriptingAndPluginContent);
                 if (fragment)
                     return fragment.release();
-- 
cgit v1.2.1