diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-23 20:21:58 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-23 20:21:59 +0100 |
| commit | bcbdd0d22bb0d6f07d5184fd16de1a9c3a439378 (patch) | |
| tree | 5e218ac6bbd361e96c885d69f475bedf2987a059 /tests/auto | |
| parent | 853ab6276facd51d61ad2451ee14170595ad45db (diff) | |
| parent | fd85eaacd9221db3a900fc5ef1364b516ea75d69 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I5d875933bc9ed920c3906b6f07ab060056bb142c
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 13 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwindow/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwindow/data/unloadSubWindow.qml | 6 |
3 files changed, 19 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 5e752d124b..ecd7bea1c4 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -350,6 +350,7 @@ private slots: void localForInIterator(); void shadowedFunctionName(); void anotherNaN(); + void callPropertyOnUndefined(); private: // static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter); @@ -8467,7 +8468,17 @@ void tst_qqmlecmascript::shadowedFunctionName() QCOMPARE(v.toBool(), true); } - +void tst_qqmlecmascript::callPropertyOnUndefined() +{ + QJSEngine engine; + QJSValue v = engine.evaluate(QString::fromLatin1( + "function f() {\n" + " var base;\n" + " base.push(1);" + "}\n" + )); + QVERIFY(!v.isError()); // well, more importantly: this shouldn't fail on an assert. +} QTEST_MAIN(tst_qqmlecmascript) diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST index bb9f403188..6c2671ad9e 100644 --- a/tests/auto/quick/qquickwindow/BLACKLIST +++ b/tests/auto/quick/qquickwindow/BLACKLIST @@ -1,3 +1,6 @@ # QTBUG-62177 [attachedProperty] osx +# QTBUG-53916 +[touchEvent_propagation:hide item] +ubuntu diff --git a/tests/auto/quick/qquickwindow/data/unloadSubWindow.qml b/tests/auto/quick/qquickwindow/data/unloadSubWindow.qml index bf9df4867d..8c409781d4 100644 --- a/tests/auto/quick/qquickwindow/data/unloadSubWindow.qml +++ b/tests/auto/quick/qquickwindow/data/unloadSubWindow.qml @@ -10,8 +10,10 @@ Window { id: loader2 sourceComponent : Window { id: inner - visible: true - Component.onCompleted: root.transientWindow = inner + Component.onCompleted: { + root.transientWindow = inner; + inner.show(); + } } } Component.onDestruction: { |