diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 18:40:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 18:40:12 (GMT) |
| commit | 37e8fd4e09c1221efde3e67e6acd5cfbb35686fd (patch) | |
| tree | c3c4a6cdeccff97e8b4ffb806a8b94f0c3f76919 /tests/auto/declarative/qdeclarativelanguage/data | |
| parent | c272d672fc1863f9e3a201e93ad277c734749845 (diff) | |
| parent | 09fcb3d479890c2f7acabf93b65ea3c09d8fe04e (diff) | |
| download | Qt-37e8fd4e09c1221efde3e67e6acd5cfbb35686fd.zip Qt-37e8fd4e09c1221efde3e67e6acd5cfbb35686fd.tar.gz Qt-37e8fd4e09c1221efde3e67e6acd5cfbb35686fd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits)
Fix loading of _debug.dylib plugins under OSX.
Remove strange binding loop in Repeater test.
Improve Transform docs.
Add media elements to the QML Elements docs.
Doc fix
typo
Test cost of importing and resolving types (but not creating objects).
Make QML 'hello world' tutorial less confusing.
ModelNode::setObjectValue() must update the object cache.
Doc improvements, fixes
Remove references to deleted qmldebugger.
Fix Rectangle::gradient rotation doc.
Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs
import "." first - i.e. override it by everything else.
Set positioner size to final size, rather than some random size mid animation
Remove effects from element list.
Fix imageprovider example compilation on Symbian arm
Remove capability flag not available in public SDKs
Fix plugin example compilation on Symbian arm
Fix compilation on Symbian winscw
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data')
3 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml new file mode 100644 index 0000000..a0706ad --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml @@ -0,0 +1,2 @@ +import Qt 4.6 +Text {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml new file mode 100644 index 0000000..d8a22a8 --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml @@ -0,0 +1,2 @@ +import Qt 4.6 +Rectangle {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir index eeb9a05..0adb0f6 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir @@ -1,4 +1,5 @@ Rectangle 1.5 InstalledTest2.qml +LocalLast 1.0 LocalLast.qml InstalledTest 1.4 InstalledTest2.qml InstalledTest 1.0 InstalledTest.qml InstalledTestTP 0.0 InstalledTest.qml |