diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-27 09:52:51 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-27 14:40:00 +0200 |
commit | e2447f9f5fbe6c8c070ce454bb48c5e45b8c35b3 (patch) | |
tree | 5ea8ffde57b47a44577ca79b90daafab52eedd1b /tests/auto/qml/qqmlecmascript/data/include_remote.qml | |
parent | 8018c4b6e7743c576a3548f6e73e588f19f632a9 (diff) | |
parent | 7302bc550aa75600c7cdcf5c3d34404e0a09cf67 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
Change-Id: I715b8a78b74cbe0dcaf599367fd6e08af4858e11
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/data/include_remote.qml')
-rw-r--r-- | tests/auto/qml/qqmlecmascript/data/include_remote.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/data/include_remote.qml b/tests/auto/qml/qqmlecmascript/data/include_remote.qml index fe020a55df..7742b621a9 100644 --- a/tests/auto/qml/qqmlecmascript/data/include_remote.qml +++ b/tests/auto/qml/qqmlecmascript/data/include_remote.qml @@ -17,5 +17,7 @@ QtObject { property bool test9: false property bool test10: false - Component.onCompleted: IncludeTest.go(); + property string serverBaseUrl; + + Component.onCompleted: IncludeTest.go(serverBaseUrl); } |