diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/JavaScriptCore/API/JSStringRefQt.cpp | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/JavaScriptCore/API/JSStringRefQt.cpp')
| -rw-r--r-- | Source/JavaScriptCore/API/JSStringRefQt.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/API/JSStringRefQt.cpp b/Source/JavaScriptCore/API/JSStringRefQt.cpp index c1ce761f7..2d5792e21 100644 --- a/Source/JavaScriptCore/API/JSStringRefQt.cpp +++ b/Source/JavaScriptCore/API/JSStringRefQt.cpp @@ -32,7 +32,6 @@ #include "JSStringRef.h" #include "OpaqueJSString.h" #include <runtime/JSCJSValue.h> -#include <wtf/OwnArrayPtr.h> QString JSStringCopyQString(JSStringRef string) { @@ -46,5 +45,5 @@ JSRetainPtr<JSStringRef> JSStringCreateWithQString(const QString& qString) if (jsString) return JSRetainPtr<JSStringRef>(Adopt, jsString.release().leakRef()); - return JSRetainPtr<JSStringRef>(Adopt, OpaqueJSString::create().leakRef()); + return JSRetainPtr<JSStringRef>(Adopt, &OpaqueJSString::create().leakRef()); } |