diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-10 05:26:57 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-10 05:26:57 (GMT) |
| commit | 6db08d1cfeb70bff5a114579fb2bfbde81310b64 (patch) | |
| tree | 33b80b513d1b23e866bc8a8b33c6168f37b40912 /src/declarative/qml/qdeclarativedirparser.cpp | |
| parent | 3a9c0af7b2e4fcb818a2769ab61c3d70e2a2c952 (diff) | |
| download | Qt-6db08d1cfeb70bff5a114579fb2bfbde81310b64.zip Qt-6db08d1cfeb70bff5a114579fb2bfbde81310b64.tar.gz Qt-6db08d1cfeb70bff5a114579fb2bfbde81310b64.tar.bz2 | |
Use no-version-specified to mean any version (used to work, fixed again,
was only working with -1.-1 which looks silly)
Diffstat (limited to 'src/declarative/qml/qdeclarativedirparser.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativedirparser.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index e730b92..b6d2115 100644 --- a/src/declarative/qml/qdeclarativedirparser.cpp +++ b/src/declarative/qml/qdeclarativedirparser.cpp @@ -151,13 +151,16 @@ bool QDeclarativeDirParser::parse() _plugins.append(entry); + } else if (sectionCount == 2) { + // No version specified (should only be used for relative qmldir files) + const Component entry(sections[0], sections[1], -1, -1); + _components.append(entry); } else if (sectionCount == 3) { const QString &version = sections[1]; const int dotIndex = version.indexOf(QLatin1Char('.')); if (dotIndex == -1) { qWarning() << "expected '.'"; // ### use reportError - } else if (version.indexOf(QLatin1Char('.'), dotIndex + 1) != -1) { qWarning() << "unexpected '.'"; // ### use reportError |