diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-09 17:59:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-09 17:59:51 +0200 |
| commit | 22e96c4d342de3bfe4fc27f4cd7233edcfe737cc (patch) | |
| tree | 6bdd02cdd8603cf16383fb339a2cfdbce82491da /src/corelib/tools/qstring.cpp | |
| parent | bd79c4e28c307ba87aca02155b845774c7ffec1f (diff) | |
| parent | fa95eb055401f5264cbc6aca761cb9b5feb4affc (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I36e6b890b65d12bf6931757540bcc9c553b5eb8f
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 7c4280d36b..6b054126dd 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -9478,7 +9478,7 @@ QString &QString::append(const QStringRef &str) { if (str.string() == this) { str.appendTo(this); - } else if (str.string()) { + } else if (!str.isNull()) { int oldSize = size(); resize(oldSize + str.size()); memcpy(data() + oldSize, str.unicode(), str.size() * sizeof(QChar)); |