diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-28 10:57:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-28 14:29:59 +0200 |
| commit | 94db5de2acefb6e96d4f6cfda2df14905a5e63c5 (patch) | |
| tree | c361f5dd4989ee0743e2a9f94b64dbb2127e5dea /tests/auto/qml/qqmlecmascript/data/include_remote_missing.qml | |
| parent | 11f67b80c4eab4b1e3eb8e6b1e8b69e7a60e42a9 (diff) | |
| parent | dee67b41b031791c7b6313e935e622ef8d594686 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I075e742da8396a268d97d3ab34bcd9e0c0cf001f
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/data/include_remote_missing.qml')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/data/include_remote_missing.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/data/include_remote_missing.qml b/tests/auto/qml/qqmlecmascript/data/include_remote_missing.qml index e8ef609fed..eb75bd676f 100644 --- a/tests/auto/qml/qqmlecmascript/data/include_remote_missing.qml +++ b/tests/auto/qml/qqmlecmascript/data/include_remote_missing.qml @@ -8,5 +8,7 @@ QtObject { property bool test2: false property bool test3: false - Component.onCompleted: IncludeTest.go(); + property string serverBaseUrl; + + Component.onCompleted: IncludeTest.go(serverBaseUrl); } |