diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 13:03:22 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 13:17:53 (GMT) |
| commit | 19095f432ef7ef424ea8dc89b19e43ed9f031b3e (patch) | |
| tree | 159654fbd2066eaea6d6fe78efc9726b5959eb3d /tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml | |
| parent | 196e1484c22f6347061fa433987a86d90e178a55 (diff) | |
| parent | 236c3ad7bacf165069b834b62fede6b147cfaf03 (diff) | |
| download | Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.zip Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.tar.gz Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
configure
src/gui/egl/qegl.cpp
src/gui/kernel/qdnd_p.h
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml new file mode 100644 index 0000000..d7acf38 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml @@ -0,0 +1,13 @@ +import Qt 4.6 + +QtObject { + property int test: external_script_func(); + property int test2: external_script_func2(); + property bool test3: is_a_undefined(); + + Script { + // Multiple script + source: [ "externalScript.js", "externalScript.2.js" ] + } +} + |