diff options
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
-rw-r--r-- | src/gui/text/qtextengine_p.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index d8ab222475..c2362e6dc5 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -541,7 +541,12 @@ public: #ifdef QT_BUILD_COMPAT_LIB return 0; // Compat should never reference this symbol #else - return block.docHandle()->formatCollection(); + if (block.docHandle()) + return block.docHandle()->formatCollection(); + else if (specialData) + return specialData->formats.data(); + + return 0; #endif } QTextCharFormat format(const QScriptItem *si) const; @@ -619,6 +624,8 @@ public: QList<QTextLayout::FormatRange> addFormats; QVector<int> addFormatIndices; QVector<int> resolvedFormatIndices; + // only used when no docHandle is available + QScopedPointer<QTextFormatCollection> formats; }; SpecialData *specialData; |