summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/API/JSStringRef.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-07-09 16:53:52 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-07-09 16:53:52 (GMT)
commitaa46e5928b8fd97bada814e56134adb23a068b24 (patch)
treedf917faf833909ad09fc1b83ffde3ba9404dfd51 /src/3rdparty/webkit/JavaScriptCore/API/JSStringRef.cpp
parentb7c63e3d89006c9795835a79741b8d7a46891f93 (diff)
parent5c53ea55e54f6371082a8ce7c3965f2fe54fcef5 (diff)
downloadQt-aa46e5928b8fd97bada814e56134adb23a068b24.zip
Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.gz
Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSStringRef.cpp')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/API/JSStringRef.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSStringRef.cpp b/src/3rdparty/webkit/JavaScriptCore/API/JSStringRef.cpp
index 6452ffc..8e236e4 100644
--- a/src/3rdparty/webkit/JavaScriptCore/API/JSStringRef.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/API/JSStringRef.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#include "JSStringRef.h"
+#include "InitializeThreading.h"
#include "OpaqueJSString.h"
#include <wtf/unicode/UTF8.h>
@@ -34,11 +35,13 @@ using namespace WTF::Unicode;
JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
{
+ initializeThreading();
return OpaqueJSString::create(chars, numChars).releaseRef();
}
JSStringRef JSStringCreateWithUTF8CString(const char* string)
{
+ initializeThreading();
if (string) {
size_t length = strlen(string);
Vector<UChar, 1024> buffer(length);