diff options
| author | Roman Pasechnik <roman@pasechnik.net> | 2015-04-11 12:49:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-15 11:29:30 +0000 |
| commit | b63185824ea213c2d19472fee302f007151dd5ca (patch) | |
| tree | 043683711ddfc7d31cda88afdb7b39cb0401dc9a /tests/auto/quick | |
| parent | c161a413ffeed9f7584adc26a727ddcdf06f8c33 (diff) | |
Fix QQuickTextDocumentWithImageResources image loading
QQuickTextDocumentWithImageResources always tries to load images itself
and not using QTextDocument internal resources. What it should do:
1) Check if QTextDocument already has image resource and use it.
2) If not, try to load resource manually.
Change-Id: Ifc4d919fc4a08b4efae50e06a42f1af7cee67af3
Task-number: QTBUG-32525
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp b/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp index 27a02377bd..302959dd7f 100644 --- a/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp +++ b/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp @@ -36,6 +36,7 @@ #include <QtQuick/QQuickTextDocument> #include <QtQuick/QQuickItem> #include <QtQuick/private/qquicktextedit_p.h> +#include <QtQuick/private/qquicktext_p_p.h> #include <QtGui/QTextDocument> #include <QtGui/QTextDocumentWriter> #include <QtQml/QQmlEngine> @@ -47,6 +48,7 @@ class tst_qquicktextdocument : public QQmlDataTest Q_OBJECT private slots: void textDocumentWriter(); + void textDocumentWithImage(); }; QString text = QStringLiteral("foo bar"); @@ -74,6 +76,20 @@ void tst_qquicktextdocument::textDocumentWriter() delete o; } +void tst_qquicktextdocument::textDocumentWithImage() +{ + QQuickTextDocumentWithImageResources document(0); + QImage image(1, 1, QImage::Format_Mono); + image.fill(1); + + QString name = "image"; + document.addResource(QTextDocument::ImageResource, name, image); + QTextImageFormat format; + format.setName(name); + QCOMPARE(image, document.image(format)); + QCOMPARE(image, document.resource(QTextDocument::ImageResource, name).value<QImage>()); +} + QTEST_MAIN(tst_qquicktextdocument) #include "tst_qquicktextdocument.moc" |