diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 13:12:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 13:12:51 (GMT) |
| commit | e15d5fc7e1a82da38b765e55d040edbdf8621ae2 (patch) | |
| tree | edf4191a346bcdae338dbad555873a23fb872341 | |
| parent | 4e35b06fc52bf054ef3f23609fe698c6eb915dc9 (diff) | |
| parent | 38db6eba54534207126915f6f195c8af9f772833 (diff) | |
| download | Qt-e15d5fc7e1a82da38b765e55d040edbdf8621ae2.zip Qt-e15d5fc7e1a82da38b765e55d040edbdf8621ae2.tar.gz Qt-e15d5fc7e1a82da38b765e55d040edbdf8621ae2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Help qt-qml integrate.
| -rw-r--r-- | tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml (renamed from tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml index 2d1a4a3..2d1a4a3 100644 --- a/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml +++ b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/Foo.qml |