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 /src/quick/items/qquicktext_p_p.h | |
| 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 'src/quick/items/qquicktext_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktext_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h index cd14008728..28435bc8c5 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_p.h @@ -179,7 +179,7 @@ public: }; class QQuickPixmap; -class QQuickTextDocumentWithImageResources : public QTextDocument, public QTextObjectInterface +class Q_AUTOTEST_EXPORT QQuickTextDocumentWithImageResources : public QTextDocument, public QTextObjectInterface { Q_OBJECT Q_INTERFACES(QTextObjectInterface) |