diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-03 13:27:13 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-03 13:27:13 +0100 |
commit | f2244103ff7a9b61fc7bcb7e920d8cc6b2f5f226 (patch) | |
tree | 8fe753743c46d4a652f582a7a2a49e5709eaa6e0 /tests/auto/quick/qquicktextdocument | |
parent | 57430b2bdad32150e0ed8ceb6893430363ee6670 (diff) | |
parent | 164af37710e5721cbc7d79a0af20f2387181c59c (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tools/qmlprofiler/qmlprofilerclient.cpp
Change-Id: I1de8832fefd0e45fea16ca072b6c7ae44fa376d4
Diffstat (limited to 'tests/auto/quick/qquicktextdocument')
-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..12fcbfda0e 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/qquicktextdocument_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" |