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

QmlJS: Get version numbers from components

Browse Source 
If we have a pure QML plugin with a qmldir file,
then the code model ends up without a version number.
This is bad, since the version is required for graphical tooling.

What we can do is to take the highest version number from all
components that are defined in the plugin.

Change-Id: Idb4206201efac91250100740e287676031d3016a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-11-01 15:20:22 +01:00
committed by Thomas Hartmann
parent d550cbdd40
commit 3673ced26e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljsdocument.cpp
View File

@@ -499,6 +499,14 @@ void Snapshot::insertLibraryInfo(const QString &path, const LibraryInfo &info)
QRegExp safeName(QLatin1String("^[a-zA-Z_][[a-zA-Z0-9_]*$")); QRegExp safeName(QLatin1String("^[a-zA-Z_][[a-zA-Z0-9_]*$"));
int majorVersion = LanguageUtils::ComponentVersion::NoVersion; int majorVersion = LanguageUtils::ComponentVersion::NoVersion;
int minorVersion = LanguageUtils::ComponentVersion::NoVersion; int minorVersion = LanguageUtils::ComponentVersion::NoVersion;
foreach (const QmlDirParser::Component &component, info.components()) {
if (component.majorVersion > majorVersion)
majorVersion = component.majorVersion;
if (component.minorVersion > minorVersion)
minorVersion = component.minorVersion;
}
if (vNr.indexIn(splitPath.last()) == 0) { if (vNr.indexIn(splitPath.last()) == 0) {
splitPath.last() = vNr.cap(1); splitPath.last() = vNr.cap(1);
bool ok; bool ok;