To allow optimizations in the scene graph, we export the private
QTextImageHandler class and add a function which will fetch
a given image when required, or return the cached image in the
document resources.
Task-number: QTBUG-20917
Change-Id: If45e51b0d9a267bc198623165e7a2cc1fb2b961f
Reviewed-on: http://codereview.qt-project.org/5227
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
return getPixmapSize(doc, imageFormat);
}
return getPixmapSize(doc, imageFormat);
}
+QImage QTextImageHandler::image(QTextDocument *doc, const QTextImageFormat &imageFormat)
+{
+ Q_ASSERT(doc != 0);
+
+ return getImage(doc, imageFormat);
+}
+
void QTextImageHandler::drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format)
{
Q_UNUSED(posInDocument)
void QTextImageHandler::drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format)
{
Q_UNUSED(posInDocument)
-class QTextImageHandler : public QObject,
- public QTextObjectInterface
+class Q_GUI_EXPORT QTextImageHandler : public QObject,
+ public QTextObjectInterface
{
Q_OBJECT
Q_INTERFACES(QTextObjectInterface)
{
Q_OBJECT
Q_INTERFACES(QTextObjectInterface)
virtual QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format);
virtual void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format);
virtual QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format);
virtual void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format);
+ QImage image(QTextDocument *doc, const QTextImageFormat &imageFormat);
typedef QImage (*ExternalImageLoaderFunction)(const QString &name, const QString &context);
typedef QImage (*ExternalImageLoaderFunction)(const QString &name, const QString &context);
- static Q_GUI_EXPORT ExternalImageLoaderFunction externalLoader; //this is needed by Qt3Support
+ static ExternalImageLoaderFunction externalLoader; //this is needed by Qt3Support