diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-04 22:54:11 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-04 22:54:11 (GMT) |
| commit | 7e268329fb6345d92765e2d8f531ecc5dcc51219 (patch) | |
| tree | c2c48b0d3dbd6f4a8a48eebaf7075bd184e851c0 /tests/auto/declarative/qmlparser/dynamicObject.1.txt | |
| parent | 28a76d03cd4f74d2619c8ab402fa97e71ce41310 (diff) | |
| parent | 93e65f89fa103aa8fb243ddd174657f7fa351644 (diff) | |
| download | Qt-7e268329fb6345d92765e2d8f531ecc5dcc51219.zip Qt-7e268329fb6345d92765e2d8f531ecc5dcc51219.tar.gz Qt-7e268329fb6345d92765e2d8f531ecc5dcc51219.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
tools/qmldebugger/canvasscene.cpp
Diffstat (limited to 'tests/auto/declarative/qmlparser/dynamicObject.1.txt')
| -rw-r--r-- | tests/auto/declarative/qmlparser/dynamicObject.1.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlparser/dynamicObject.1.txt b/tests/auto/declarative/qmlparser/dynamicObject.1.txt index ac892c3..4be0c8d 100644 --- a/tests/auto/declarative/qmlparser/dynamicObject.1.txt +++ b/tests/auto/declarative/qmlparser/dynamicObject.1.txt @@ -1,3 +1,5 @@ +import Test 1.0 +import Qt 4.6 SetProperties { propa: a + 10 propb: Math.min(a, 10) |