diff options
| -rw-r--r-- | dist/changes-5.12.3 | 20 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qscriptable/tst_qscriptable.cpp | 45 | ||||
| -rw-r--r-- | tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | 2 |
5 files changed, 68 insertions, 3 deletions
diff --git a/dist/changes-5.12.3 b/dist/changes-5.12.3 new file mode 100644 index 0000000..8803320 --- /dev/null +++ b/dist/changes-5.12.3 @@ -0,0 +1,20 @@ +Qt 5.12.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.2. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp index 9f60761..f9f77b1 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp @@ -1762,7 +1762,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_call_NotJSFunction) CallFrame* previousCallFrame = stackFrame.callFrame; CallFrame* callFrame = CallFrame::create(previousCallFrame->registers() + registerOffset); - callFrame->init(0, static_cast<Instruction*>((STUB_RETURN_ADDRESS).value()), previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, 0); + callFrame->init(0, static_cast<Instruction*>((STUB_RETURN_ADDRESS).value()), previousCallFrame->scopeChain(), previousCallFrame, 0, argCount, asObject(funcVal)); stackFrame.callFrame = callFrame; Register* argv = stackFrame.callFrame->registers() - RegisterFile::CallFrameHeaderSize - argCount; diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index c5f437b..5bd399f 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -2837,7 +2837,7 @@ JSC::CallFrame *QScriptEnginePrivate::pushContext(JSC::CallFrame *exec, JSC::JSV JSC::CallFrame *newCallFrame = exec; if (callee == 0 //called from public QScriptEngine::pushContext || exec->returnPC() == 0 || (contextFlags(exec) & NativeContext) //called from native-native call - || (exec->codeBlock() && exec->callee() != callee)) { //the interpreter did not build a frame for us. + || exec->callee() != callee) { //the interpreter did not build a frame for us. //We need to check if the Interpreter might have already created a frame for function called from JS. JSC::Interpreter *interp = exec->interpreter(); JSC::Register *oldEnd = interp->registerFile().end(); diff --git a/tests/auto/qscriptable/tst_qscriptable.cpp b/tests/auto/qscriptable/tst_qscriptable.cpp index 1a0fbe1..b800613 100644 --- a/tests/auto/qscriptable/tst_qscriptable.cpp +++ b/tests/auto/qscriptable/tst_qscriptable.cpp @@ -73,6 +73,9 @@ public slots: QScriptValue getArguments(); int getArgumentCount(); + QString toString() const; + int valueOf() const; + signals: void sig(int); @@ -172,6 +175,16 @@ bool MyScriptable::isBar() return str.contains(QLatin1Char('@')); } +QString MyScriptable::toString() const +{ + return thisObject().property("objectName").toString(); +} + +int MyScriptable::valueOf() const +{ + return thisObject().property("baz").toInt32(); +} + class tst_QScriptable : public QObject { Q_OBJECT @@ -188,6 +201,8 @@ private slots: void thisObject(); void arguments(); void throwError(); + void stringConstructor(); + void numberConstructor(); private: QScriptEngine m_engine; @@ -386,5 +401,35 @@ void tst_QScriptable::throwError() QCOMPARE(ret.toString(), QString("Error: MyScriptable.foo")); } +void tst_QScriptable::stringConstructor() +{ + m_scriptable.setObjectName("TestObject"); + + m_engine.globalObject().setProperty("js_obj", m_engine.newObject()); + m_engine.evaluate( + "js_obj.str = scriptable.toString();" + "js_obj.toString = function() { return this.str }"); + + QCOMPARE(m_engine.evaluate("String(scriptable)").toString(), + m_engine.evaluate("String(js_obj)").toString()); + + QCOMPARE(m_engine.evaluate("String(scriptable)").toString(), + m_engine.evaluate("scriptable.toString()").toString()); +} + +void tst_QScriptable::numberConstructor() +{ + m_engine.globalObject().setProperty("js_obj", m_engine.newObject()); + m_engine.evaluate( + "js_obj.num = scriptable.valueOf();" + "js_obj.valueOf = function() { return this.num }"); + + QCOMPARE(m_engine.evaluate("Number(scriptable)").toInt32(), + m_engine.evaluate("Number(js_obj)").toInt32()); + + QCOMPARE(m_engine.evaluate("Number(scriptable)").toInt32(), + m_engine.evaluate("scriptable.valueOf()").toInt32()); +} + QTEST_MAIN(tst_QScriptable) #include "tst_qscriptable.moc" diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp index e199d71..58fee07 100644 --- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp +++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp @@ -1354,7 +1354,7 @@ void tst_QScriptExtQObject::callQtInvokable2() // first time we expect failure because the metatype is not registered m_myObject->resetQtFunctionInvoked(); - QCOMPARE(QMetaType::type("QVector<CustomType>"), QMetaType::UnknownType); // this type should not be registered yet + QCOMPARE(QMetaType::Type(QMetaType::type("QVector<CustomType>")), QMetaType::UnknownType); // this type should not be registered yet QCOMPARE(m_engine->evaluate("myObject.myInvokableReturningVectorOfCustomType()").isError(), true); QCOMPARE(m_myObject->qtFunctionInvoked(), -1); |