From 6d3939dbfdf32b6a8d398c281a6c272c70c46f8f Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@digia.com>
Date: Thu, 16 Jan 2014 11:41:25 +0100
Subject: [PATCH] qml: accept qmltypeinfo with larger minor version
Change-Id: I56559f6d9bd128069e2c270e033c958a6a239c3a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
src/libs/qmljs/qmljstypedescriptionreader.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/libs/qmljs/qmljstypedescriptionreader.cpp b/src/libs/qmljs/qmljstypedescriptionreader.cpp
index a41108e542b..245488ad9e1 100644
--- a/src/libs/qmljs/qmljstypedescriptionreader.cpp
+++ b/src/libs/qmljs/qmljstypedescriptionreader.cpp
@@ -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."));
--
GitLab