diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-26 13:42:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-26 13:42:08 +0100 |
| commit | 3832b1e05b80a0f509be17dd3619a2f8bb70074f (patch) | |
| tree | 3763c243b13c8228b1508ce5902dc2f587cabfdd /tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp | |
| parent | f9fae251ca07401ee1b0039edc6ea6b7a522b5a7 (diff) | |
| parent | 5c53861cced2d40490e4c7bfc202aadc532df4c2 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
tests/auto/qml/qml.pro
tools/qmlprofiler/qmlprofilerclient.cpp
Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4
Diffstat (limited to 'tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp')
| -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" |