diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-11 04:36:59 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-11 04:36:59 (GMT) |
commit | b2ba70b372c4e365f4ffe72d310535dcac2af066 (patch) | |
tree | 7b5c92e6fd2edcd947951c99e9abe8b697a5ac17 /tests | |
parent | d8fb96128d9cc9c38da466ef125c1a547ce20c8c (diff) | |
parent | f55ecc080d0c5eca4e65a235c63ab13867c86874 (diff) | |
download | Qt-b2ba70b372c4e365f4ffe72d310535dcac2af066.zip Qt-b2ba70b372c4e365f4ffe72d310535dcac2af066.tar.gz Qt-b2ba70b372c4e365f4ffe72d310535dcac2af066.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix race condition in processJobs()
Don't endless loop
Compile on symbian
Don't release register prematurely
Rework threading internals in XmlListModel to avoid global static
Doc
Doc
Compile in namespace
Fix alias warnings in QML compiled bindings
Fix alias warnings in MetaCallArgument
Fix alias warnings in QDeclarativeVME
Fix alias warnings in QDeclarativeGuard
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20648.qml | 7 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20648.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20648.qml new file mode 100644 index 0000000..40f21ef --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_20648.qml @@ -0,0 +1,7 @@ +import QtQuick 1.0 + +QtObject { + property bool hd: true + + property real test: ((hd ? 100 : 20) + 0) +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 71214a3..bf7c9a4 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -177,6 +177,7 @@ private slots: void aliasWritesOverrideBindings(); void pushCleanContext(); void realToInt(); + void qtbug_20648(); void include(); @@ -3090,6 +3091,15 @@ void tst_qdeclarativeecmascript::realToInt() QCOMPARE(object->value(), int(8)); } +void tst_qdeclarativeecmascript::qtbug_20648() +{ + QDeclarativeComponent component(&engine, TEST_FILE("qtbug_20648.qml")); + QObject *o = component.create(); + QVERIFY(o != 0); + QCOMPARE(o->property("test").toInt(), 100); + delete o; +} + QTEST_MAIN(tst_qdeclarativeecmascript) #include "tst_qdeclarativeecmascript.moc" |