diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-23 12:36:29 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-23 12:36:29 +0100 |
| commit | 03fe99ba3a7d29b1606660baa407cff21c4d4d35 (patch) | |
| tree | 525d5f03e8703bf7e9a7851280de67a597dceea1 /src/qml/jsruntime/qv4string_p.h | |
| parent | f02e234fc012f4430378bc5205f32914822e4dff (diff) | |
| parent | 94e6106d357ca5a1349a2b10a69dd84db34065c8 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea
Diffstat (limited to 'src/qml/jsruntime/qv4string_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4string_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h index 4890a85724..5b0fd292d6 100644 --- a/src/qml/jsruntime/qv4string_p.h +++ b/src/qml/jsruntime/qv4string_p.h @@ -73,11 +73,7 @@ struct Q_QML_PRIVATE_EXPORT String : Base { #ifndef V4_BOOTSTRAP void init(MemoryManager *mm, const QString &text); void init(MemoryManager *mm, String *l, String *n); - void destroy() { - if (!largestSubLength && !text->ref.deref()) - QStringData::deallocate(text); - Base::destroy(); - } + void destroy(); void simplifyString() const; int length() const { Q_ASSERT((largestSubLength && |