diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-05-29 09:45:57 +0300 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2018-05-29 08:24:17 +0000 |
| commit | 6550fc67d2a78b24e432d60351ef758028079048 (patch) | |
| tree | 0b6e93492fc5e88dce6999ae4edebdf51b598a84 | |
| parent | f5578e3ff5cfc35fcdd980e7a9044398092b240a (diff) | |
Update UIP version check
Task-number: QT3DS-1790
Change-Id: If02350724689d69efad57677d40a84a017e7196d
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| -rw-r--r-- | src/runtime/q3dsuipparser.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/runtime/q3dsuipparser.cpp b/src/runtime/q3dsuipparser.cpp index 5f4b74b..b791fba 100644 --- a/src/runtime/q3dsuipparser.cpp +++ b/src/runtime/q3dsuipparser.cpp @@ -110,10 +110,13 @@ Q3DSUipPresentation *Q3DSUipParser::createPresentation(const QString &presentati QXmlStreamReader *r = reader(); if (r->readNextStartElement()) { - if (r->name() == QStringLiteral("UIP") && r->attributes().value(QLatin1String("version")) == QStringLiteral("3")) + if (r->name() == QStringLiteral("UIP") + && (r->attributes().value(QLatin1String("version")) == QStringLiteral("4") + || r->attributes().value(QLatin1String("version")) == QStringLiteral("3"))) { parseUIP(); - else - r->raiseError(QObject::tr("Not a UIP version 3 document.")); + } else { + r->raiseError(QObject::tr("UIP version is too low, and is no longer supported.")); + } } if (r->hasError()) { |