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

QmlJs: search for version in parent modules.

Browse Source 
Modules used to be searched by name with optionally an attached
version.  Now, if a module with version is not found, the version is
attached to the parent module.

Task-number: QTCREATORBUG-16145
Change-Id: Ie0f30d4df64d13b3ec4c5ee38e9ad9215ae56420
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Marco Benelli
2016-04-29 16:25:17 +02:00
committed by Marco Benelli
parent b92ff237a9
commit 1556a707c3
3 changed files with 70 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/libs/qmljs/qmljslink.cpp
View File

@@ -377,38 +377,8 @@ Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInf
const QString packageName = importInfo.name();
const ComponentVersion version = importInfo.version();
bool importFound = false;
const QString &packagePath = importInfo.path();
// check the filesystem with full version
foreach (const QString &importPath, importPaths) {
QString libraryPath = QString::fromLatin1("%1/%2.%3").arg(importPath, packagePath, version.toString());
if (importLibrary(doc, libraryPath, &import, importPath)) {
importFound = true;
break;
}
}
if (!importFound) {
// check the filesystem with major version
foreach (const QString &importPath, importPaths) {
QString libraryPath = QString::fromLatin1("%1/%2.%3").arg(importPath, packagePath,
QString::number(version.majorVersion()));
if (importLibrary(doc, libraryPath, &import, importPath)) {
importFound = true;
break;
}
}
}
if (!importFound) {
// check the filesystem with no version
foreach (const QString &importPath, importPaths) {
QString libraryPath = QString::fromLatin1("%1/%2").arg(importPath, packagePath);
if (importLibrary(doc, libraryPath, &import, importPath)) {
importFound = true;
break;
}
}
}
QString libraryPath = modulePath(packageName, version.toString(), importPaths);
bool importFound = importLibrary(doc, libraryPath, &import);
// if there are cpp-based types for this package, use them too
if (valueOwner->cppQmlTypes().hasModule(packageName)) {