diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:34:35 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:34:35 +0100 |
| commit | 628c5e571abb3715f404ca46a9df82c4f97873a0 (patch) | |
| tree | d7ff2dabba16738b12a04d3a1e535147a6de207b /src/quick/items/qquicktext.cpp | |
| parent | da6360b85d311d94b8d19126286404c0cc8c76fe (diff) | |
| parent | aebdf4649934e65bdab94d799da5afb2da145a37 (diff) | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Change-Id: I127c746c4131fc907ea4b6713d307f12a4760666
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index bff38879cf..03b656cbb2 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -2737,7 +2737,7 @@ void QQuickText::invalidateFontCaches() { Q_D(QQuickText); - if (d->richText && d->extra->doc != 0) { + if (d->richText && d->extra.isAllocated() && d->extra->doc != 0) { QTextBlock block; for (block = d->extra->doc->firstBlock(); block.isValid(); block = block.next()) { if (block.layout() != 0 && block.layout()->engine() != 0) |