diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-15 23:21:45 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-17 02:21:59 (GMT) |
| commit | 83000e5def6787df01be6b8b423cb4aeadc2d9d1 (patch) | |
| tree | ef47ab965e0d4988ecf9a4d082cbe3a8431f95d3 /src/declarative/qml | |
| parent | 34f0d9de68963499bfbc245639d0a099433734b1 (diff) | |
| download | Qt-83000e5def6787df01be6b8b423cb4aeadc2d9d1.zip Qt-83000e5def6787df01be6b8b423cb4aeadc2d9d1.tar.gz Qt-83000e5def6787df01be6b8b423cb4aeadc2d9d1.tar.bz2 | |
One url for an *unqualilfied* import is not special.
Stops tst_qdeclarativelanguage passing when network transparency breaks.
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index e19e53f..7c21ab8 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1615,7 +1615,8 @@ public: if (s) { if (s->find(unqualifiedtype,vmajor,vminor,type_return,url_return)) return true; - if (s->urls.count() == 1 && !s->isLibrary[0] && url_return) { + if (s->urls.count() == 1 && !s->isLibrary[0] && url_return && s != &unqualifiedset) { + // qualified, and only 1 url *url_return = QUrl(s->urls[0]+QLatin1Char('/')).resolved(QUrl(QString::fromUtf8(unqualifiedtype) + QLatin1String(".qml"))); return true; } |