diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-29 13:01:21 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-29 13:01:22 +0100 |
commit | 1e421097f08876f5e2242be6f7a20db2aeb51692 (patch) | |
tree | c45b9323368cfdede67facd43c076a85322f12f6 /tests/auto/qml/qqmlengine | |
parent | f4788a13e98aa4e5438327094524d7b8239893ec (diff) | |
parent | 666bc731a0ba930ca0cfda18daf836913fd91361 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e
Diffstat (limited to 'tests/auto/qml/qqmlengine')
7 files changed, 37 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlengine/data/interception/includes/Intercepted.qml b/tests/auto/qml/qqmlengine/data/interception/includes/Intercepted.qml new file mode 100644 index 0000000000..449207e0e3 --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/interception/includes/Intercepted.qml @@ -0,0 +1,5 @@ +import QtQml 2.0 + +QtObject { + property string myStr: "base file" +} diff --git a/tests/auto/qml/qqmlengine/data/interception/includes/intercepted.js b/tests/auto/qml/qqmlengine/data/interception/includes/intercepted.js new file mode 100644 index 0000000000..fef9f3cd44 --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/interception/includes/intercepted.js @@ -0,0 +1,3 @@ +Qt.include("intercepted/included.js") + +var myStr = myString() diff --git a/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/included.js b/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/included.js new file mode 100644 index 0000000000..b6e141dfaa --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/included.js @@ -0,0 +1,3 @@ +function myString() { + return "base include file"; +} diff --git a/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/intercepted.js b/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/intercepted.js new file mode 100644 index 0000000000..fef9f3cd44 --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/intercepted.js @@ -0,0 +1,3 @@ +Qt.include("intercepted/included.js") + +var myStr = myString() diff --git a/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/intercepted/included.js b/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/intercepted/included.js new file mode 100644 index 0000000000..c0215ebbe5 --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/interception/includes/intercepted/intercepted/included.js @@ -0,0 +1,3 @@ +function myString() { + return "intercepted include file"; +} diff --git a/tests/auto/qml/qqmlengine/data/interception/includes/urlInterceptor.qml b/tests/auto/qml/qqmlengine/data/interception/includes/urlInterceptor.qml new file mode 100644 index 0000000000..be86195bd8 --- /dev/null +++ b/tests/auto/qml/qqmlengine/data/interception/includes/urlInterceptor.qml @@ -0,0 +1,11 @@ +import QtQml 2.0 +import "intercepted.js" as Script + +QtObject { + property url filePath: "doesNotExist.file" + property url resolvedUrl: Qt.resolvedUrl("doesNotExist.file"); + property url absoluteUrl: Qt.resolvedUrl("file:///doesNotExist.file"); + property string childString: child.myStr + property string scriptString: Script.myStr + property Intercepted child: Intercepted {} +} diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp index a6f0ff6efb..3208745c5c 100644 --- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp +++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp @@ -741,6 +741,15 @@ void tst_qqmlengine::urlInterceptor_data() << QStringLiteral("base file") << testFileUrl("interception/strings/intercepted/doesNotExist.file").toString() << QStringLiteral("file:///intercepted/doesNotExist.file"); + + QTest::newRow("InterceptIncludes") + << testFileUrl("interception/includes/urlInterceptor.qml") + << (QList<QQmlAbstractUrlInterceptor::DataType>() << QQmlAbstractUrlInterceptor::JavaScriptFile) + << testFileUrl("interception/includes/doesNotExist.file").toString() + << QStringLiteral("base file") + << QStringLiteral("intercepted include file") + << testFileUrl("interception/includes/doesNotExist.file").toString() + << QStringLiteral("file:///doesNotExist.file"); } void tst_qqmlengine::urlInterceptor() |