diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-01-14 12:00:56 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-01-16 12:46:52 +0100 |
commit | 291aea14636a0e779d874a01630524facb1397dd (patch) | |
tree | 044ff4131a9b3f5a3edb00e6a807d0609c04a182 /tests/auto/qml/qjsengine | |
parent | 39f1e0d66dc434e764731fbfed29c8fd98d217aa (diff) | |
parent | 88e87647c3b7d651dba2c8e61f945d47ecdd02c4 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4debugging.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4functionobject_p.h
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/quick/scenegraph/shaders/visualization.frag
tests/auto/qml/qjsengine/tst_qjsengine.cpp
Change-Id: I492e8546c278f80a300a2129e9a29d861e144a30
Diffstat (limited to 'tests/auto/qml/qjsengine')
-rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 13e60fefd9..9f86c8e4e1 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -175,6 +175,7 @@ private slots: void privateMethods(); void engineForObject(); + void intConversion_QTBUG43309(); signals: void testSignal(); @@ -3639,6 +3640,16 @@ void tst_QJSEngine::engineForObject() QVERIFY(!qjsEngine(&object)); } +void tst_QJSEngine::intConversion_QTBUG43309() +{ + // This failed in the interpreter: + QJSEngine engine; + QString jsCode = "var n = 0.1; var m = (n*255) | 0; m"; + QJSValue result = engine.evaluate( jsCode ); + QVERIFY(result.isNumber()); + QCOMPARE(result.toNumber(), 25.0); +} + QTEST_MAIN(tst_QJSEngine) #include "tst_qjsengine.moc" |