diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-10 01:00:41 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-10 17:01:22 +0200 |
| commit | 85d3061c1cd4617ef09cb381320611c27da205a5 (patch) | |
| tree | 2e4755ff4804008f982480d1669ba7659c3685a6 /src/gui/text/qtextobject.cpp | |
| parent | ca6a037d95ed1915773bf28f9190a012164c6443 (diff) | |
| parent | 6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 1302bd66bb..b845889c3d 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1322,7 +1322,7 @@ QTextList *QTextBlock::textList() const QTextBlockUserData *QTextBlock::userData() const { if (!p || !n) - return 0; + return nullptr; const QTextBlockData *b = p->blockMap().fragment(n); return b->userData; |