diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-13 03:06:21 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-13 03:06:21 (GMT) |
| commit | 6a9a804919599764bb183380a1d5885c3658444f (patch) | |
| tree | c832347db923931a765ada46d74161df29515742 /src/declarative/qml | |
| parent | ff0020481398e7c109973949260a42711c4cdcdc (diff) | |
| download | Qt-6a9a804919599764bb183380a1d5885c3658444f.zip Qt-6a9a804919599764bb183380a1d5885c3658444f.tar.gz Qt-6a9a804919599764bb183380a1d5885c3658444f.tar.bz2 | |
Fix and test remote root component with qmldir-specified content.
6ed43975f6733265b8b91b00a9a212076d896ef9 was not correct fix (just invalidated the test)
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompositetypemanager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp index 05e8d22..d1ebe9a 100644 --- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp +++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp @@ -723,6 +723,10 @@ void QDeclarativeCompositeTypeManager::compile(QDeclarativeCompositeTypeData *un } } + QUrl importUrl = unit->imports.baseUrl().resolved(QUrl("qmldir")); + if (toLocalFileOrQrc(importUrl).isEmpty()) + resourceList.prepend(importUrl); + for (int ii = 0; ii < resourceList.count(); ++ii) { QUrl url = unit->imports.baseUrl().resolved(resourceList.at(ii)); |