From 2eb96bf5b68cbdcc1ebd2616b0b9e5f0f77eb257 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Wed, 2 Dec 2009 20:26:39 +0100
Subject: Add data: URL handling to QTextDocument::loadResource

Merge-request: 1560
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
---
 src/gui/text/qtextdocument.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 523dd18..3b0a979 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -61,6 +61,7 @@
 #include <qapplication.h>
 #include "qtextcontrol_p.h"
 #include "private/qtextedit_p.h"
+#include "private/qdataurl_p.h"
 
 #include "qtextdocument_p.h"
 #include <private/qprinter_p.h>
@@ -1924,6 +1925,10 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
     }
 #endif
 
+    // handle data: URLs
+    if (r.isNull() && name.scheme() == QLatin1String("data"))
+        r = qDecodeDataUrl(name).second;
+
     // if resource was not loaded try to load it here
     if (!doc && r.isNull() && name.isRelative()) {
         QUrl currentURL = d->url;
-- 
cgit v0.12