diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
commit | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (patch) | |
tree | b7abd9f49ae1d4d2e426a5883bfccd42b8e2ee12 /Source/WebCore/bridge/qt/qt_runtime.cpp | |
parent | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (diff) |
Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)
Diffstat (limited to 'Source/WebCore/bridge/qt/qt_runtime.cpp')
-rw-r--r-- | Source/WebCore/bridge/qt/qt_runtime.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/bridge/qt/qt_runtime.cpp b/Source/WebCore/bridge/qt/qt_runtime.cpp index da186b630..adae7ad4c 100644 --- a/Source/WebCore/bridge/qt/qt_runtime.cpp +++ b/Source/WebCore/bridge/qt/qt_runtime.cpp @@ -287,9 +287,9 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type switch (hint) { case QMetaType::Bool: if (type == Object && object->inherits(&BooleanObject::s_info)) - ret = QVariant(asBooleanObject(value)->internalValue().toBoolean(exec)); + ret = QVariant(asBooleanObject(value)->internalValue().toBoolean()); else - ret = QVariant(value.toBoolean(exec)); + ret = QVariant(value.toBoolean()); if (type == Boolean) dist = 0; else @@ -1521,7 +1521,7 @@ JSValue QtRuntimeMetaMethod::connectGetter(ExecState* exec, JSValue slotBase, Pr QW_DS(QtRuntimeMetaMethod, thisObj); if (!d->m_connect) - d->m_connect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.impl(), true, d->m_instance, d->m_index, d->m_signature)); + d->m_connect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.publicName(), true, d->m_instance, d->m_index, d->m_signature)); return d->m_connect.get(); } @@ -1531,7 +1531,7 @@ JSValue QtRuntimeMetaMethod::disconnectGetter(ExecState* exec, JSValue slotBase, QW_DS(QtRuntimeMetaMethod, thisObj); if (!d->m_disconnect) - d->m_disconnect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.impl(), false, d->m_instance, d->m_index, d->m_signature)); + d->m_disconnect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.publicName(), false, d->m_instance, d->m_index, d->m_signature)); return d->m_disconnect.get(); } |