diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-27 14:51:30 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-05-30 08:25:19 +0200 |
| commit | 8742026380faeb39c7084872d5c146f301253a78 (patch) | |
| tree | e998754e2a19c577afc589b2df9f2e067a0537ef /src/libs/qmljs/qmljsdocument.cpp | |
| parent | 42e5e5f00afb02c764772ee1bded08fd1ce37689 (diff) | |
| download | qt-creator-8742026380faeb39c7084872d5c146f301253a78.tar.gz | |
QmlJS: Allow for QML modules with version subdirectories.
That means
import Foo 2.1
can resolve to
/path/Foo.2.1 or
/path/Foo.2 or
/path/Foo
Task-number: QTCREATORBUG-4607
Change-Id: Ie1efc5be2ca2ed3ccc130e8a662f94aed11bec1a
Reviewed-on: http://codereview.qt.nokia.com/194
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsdocument.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsdocument.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp index 6766d9f4ce..0eceac0ca9 100644 --- a/src/libs/qmljs/qmljsdocument.cpp +++ b/src/libs/qmljs/qmljsdocument.cpp @@ -363,14 +363,14 @@ void Document::extractPragmas(QString *source) } } -LibraryInfo::LibraryInfo() - : _valid(false) +LibraryInfo::LibraryInfo(Status status) + : _status(status) , _dumpStatus(NoTypeInfo) { } LibraryInfo::LibraryInfo(const QmlDirParser &parser) - : _valid(true) + : _status(Found) , _components(parser.components()) , _plugins(parser.plugins()) , _dumpStatus(NoTypeInfo) |