Support inline images with <img> tag in StyledText

Task-number: QTBUG-21793
Change-Id: Ie7b9f293c6c9a949c1899152c38b61251b0069d3
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

1 files changed, 39 insertions, 7 deletions

diff --git a/src/quick/util/qdeclarativestyledtext_p.h b/src/quick/util/qdeclarativestyledtext_p.h
index f3e9fef457..1c9086e7d1 100644
--- a/src/quick/util/qdeclarativestyledtext_p.h
+++ b/src/quick/util/qdeclarativestyledtext_p.h
@@ -42,23 +42,55 @@
 #ifndef QDECLARATIVESTYLEDTEXT_H
 #define QDECLARATIVESTYLEDTEXT_H
 
-#include <QSizeF>
+#include <QSize>
+#include <QPointF>
+#include <QList>
+#include <QUrl>
+#include <QtQuick/private/qdeclarativepixmapcache_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QPainter;
-class QPointF;
-class QString;
+class QDeclarativeStyledTextImgTag;
 class QDeclarativeStyledTextPrivate;
-class QTextLayout;
+class QString;
+class QDeclarativeContext;
+
+class Q_AUTOTEST_EXPORT QDeclarativeStyledTextImgTag
+{
+public:
+    QDeclarativeStyledTextImgTag()
+        : position(0), align(QDeclarativeStyledTextImgTag::Bottom), pix(0)
+    { }
+
+    ~QDeclarativeStyledTextImgTag() { delete pix; }
+
+    enum Align {
+        Bottom,
+        Middle,
+        Top
+    };
+
+    QUrl url;
+    QPointF pos;
+    QSize size;
+    int position;
+    Align align;
+    QDeclarativePixmap *pix;
+};
 
 class Q_AUTOTEST_EXPORT QDeclarativeStyledText
 {
 public:
-    static void parse(const QString &string, QTextLayout &layout);
+    static void parse(const QString &string, QTextLayout &layout,
+                      QList<QDeclarativeStyledTextImgTag*> &imgTags,
+                      QDeclarativeContext *context,
+                      bool preloadImages);
 
 private:
-    QDeclarativeStyledText(const QString &string, QTextLayout &layout);
+    QDeclarativeStyledText(const QString &string, QTextLayout &layout,
+                           QList<QDeclarativeStyledTextImgTag*> &imgTags,
+                           QDeclarativeContext *context,
+                           bool preloadImages);
     ~QDeclarativeStyledText();
 
     QDeclarativeStyledTextPrivate *d;