diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:25:47 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:25:47 +0200 |
| commit | cb7d894e08b6a731a277f711572e0f1e45d5dc93 (patch) | |
| tree | bd7cd1f75814a140623899e7c8dbcc806c7c465b | |
| parent | 9c79a3de3c0600c991af2aa2b9306040cdbb83c8 (diff) | |
| parent | 71f6dee8791c95fd862ca3651d7f4b7d6b9f440e (diff) | |
| download | qtscript-cb7d894e08b6a731a277f711572e0f1e45d5dc93.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I8d0ef0020712357bbdd3b4ae4d812c72af259dc5
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h index 7e5679f..3f0e764 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/ThreadSpecific.h @@ -256,7 +256,8 @@ inline void ThreadSpecific<T>::destroy(void* ptr) #endif #if PLATFORM(QT) // See comment as above - data->owner->m_key.setLocalData(data); + if (!data->owner->m_key.hasLocalData()) + data->owner->m_key.setLocalData(data); #endif data->value->~T(); |