diff options
| author | hausmann@webkit.org <hausmann@webkit.org> | 2012-06-13 13:37:54 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-13 16:11:58 +0200 |
| commit | 0001dcd3a2d67fe8832562746a293754a9a8d7a0 (patch) | |
| tree | 115a06aa0f07dfefa0d5bc34f1465c8b16139143 /Source/JavaScriptCore/runtime/JSString.cpp | |
| parent | 0bb233d1f7c4317bb772d72cc3f92cbcdb4027de (diff) | |
| download | qtwebkit-0001dcd3a2d67fe8832562746a293754a9a8d7a0.tar.gz | |
Remove dependency to QtScript for the Qt 5 build https://bugs.webkit.org/show_bug.cgi?id=88993
Reviewed by Kenneth Rohde Christiansen.
Source/WebCore:
Replace the use of QScriptEngine::ValueOwnership with an enum local
to the class where it is used (QtInstance).
* Target.pri:
* bindings/js/ScriptControllerQt.cpp:
(WebCore::ScriptController::createScriptInstanceForWidget):
* bridge/qt/qt_instance.cpp:
(JSC::Bindings::QtInstance::QtInstance):
(JSC::Bindings::QtInstance::~QtInstance):
(JSC::Bindings::QtInstance::getQtInstance):
* bridge/qt/qt_instance.h:
(QtInstance):
(JSC::Bindings::QtInstance::create):
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::convertQVariantToValue):
* bridge/qt/qt_runtime_qt4.cpp:
(JSC::Bindings::convertQVariantToValue):
Source/WebKit/qt:
When building against Qt 5, replace the use of QScriptEngine::ValueOwnership with
a (compatible) QWebFrame::ValueOwnership enum.
* Api/qwebframe.cpp:
(qtSenderCallback):
(QWebFrame::addToJavaScriptWindowObject):
* Api/qwebframe.h:
* tests/qobjectbridge/tst_qobjectbridge.cpp:
(tst_QObjectBridge::arrayObjectEnumerable):
(tst_QObjectBridge::ownership):
(tst_QObjectBridge::qObjectWrapperWithSameIdentity):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120196 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Diffstat (limited to 'Source/JavaScriptCore/runtime/JSString.cpp')
0 files changed, 0 insertions, 0 deletions