diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
| commit | 3ea28c383846a4af67ddd0c7d33dad0537a9972e (patch) | |
| tree | 901f26b86b820ec4b4fc949ae38b6ce165b386af /tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml | |
| parent | 7cc2e423d39c3b519279d21cd3881f1a135913fd (diff) | |
| parent | d04664b9da6356d3c97e632fb35e27c6822e0dc9 (diff) | |
| download | Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.zip Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.gz Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml index 04f5ba3..3f73538 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml @@ -1,5 +1,5 @@ import Test 1.0 -import Qt 4.7 +import QtQuick 1.0 QtObject { property alias obj : otherObj |