diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 21:27:43 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-10 21:27:43 +0000 |
| commit | 5bb19648f1a9009697253a8038a3cd2216d7b936 (patch) | |
| tree | face25989bf38dcc8fdc202ae821e7322608640c /src | |
| parent | fd395141f00ef0fc72e2d6b7da0c6397324036a3 (diff) | |
| parent | 628c5e571abb3715f404ca46a9df82c4f97873a0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src')
| -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) |