feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qml: accept qmltypeinfo with larger minor version

Browse Source 
Change-Id: I56559f6d9bd128069e2c270e033c958a6a239c3a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-01-16 11:41:25 +01:00
parent 3a3dbb3746
commit 6d3939dbfd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmljs/qmljstypedescriptionreader.cpp
View File

@@ -111,10 +111,12 @@ void TypeDescriptionReader::readDocument(UiProgram *ast)
version = ComponentVersion(versionString.left(dotIdx).toInt(), version = ComponentVersion(versionString.left(dotIdx).toInt(),
versionString.mid(dotIdx + 1).toInt()); versionString.mid(dotIdx + 1).toInt());
} }
if (version > ComponentVersion(1, 1)) { if (version.majorVersion() != 1) {
addError(import->versionToken, tr("Expected version 1.1 or lower.")); addError(import->versionToken, tr("Major version different from 1 not supported."));
return; return;
} }
if (version.minorVersion() > 1)
addWarning(import->versionToken, tr("Reading only version 1.1 parts."));
if (!ast->members || !ast->members->member || ast->members->next) { if (!ast->members || !ast->members->member || ast->members->next) {
addError(SourceLocation(), tr("Expected document to contain a single object definition.")); addError(SourceLocation(), tr("Expected document to contain a single object definition."));