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 10:39:33 +0200 |
| commit | 6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (patch) | |
| tree | 2d8c70bc359810f926374ffebd649576345a9c7f /src/gui/text | |
| parent | d72ea9cbd3c2bde4645745c5aeba7cc052d87f0d (diff) | |
| parent | 4bb975717b0ba2c7b41e1a44192c2d54c919cfee (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/time/qdatetime.cpp
src/widgets/widgets/qcombobox.h
Change-Id: Ib84352e8fe34aed2986a1c94e7346a46a71c803b
Diffstat (limited to 'src/gui/text')
| -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; |