Commit 6d3939db authored by Fawzi Mohamed's avatar Fawzi Mohamed
Browse files

qml: accept qmltypeinfo with larger minor version



Change-Id: I56559f6d9bd128069e2c270e033c958a6a239c3a
Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
parent 3a3dbb37
......@@ -111,10 +111,12 @@ void TypeDescriptionReader::readDocument(UiProgram *ast)
version = ComponentVersion(versionString.left(dotIdx).toInt(),
versionString.mid(dotIdx + 1).toInt());
}
if (version > ComponentVersion(1, 1)) {
addError(import->versionToken, tr("Expected version 1.1 or lower."));
if (version.majorVersion() != 1) {
addError(import->versionToken, tr("Major version different from 1 not supported."));
return;
}
if (version.minorVersion() > 1)
addWarning(import->versionToken, tr("Reading only version 1.1 parts."));
if (!ast->members || !ast->members->member || ast->members->next) {
addError(SourceLocation(), tr("Expected document to contain a single object definition."));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment