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

QmlDesigner.MetaInfo: cleanup and fix

Browse Source 
Packages can be qualified by several ".".
We have to take this into account.

Change-Id: I5da0c624b464448dc6f16aaafa3ad3682f423ccc
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2013-04-18 09:55:45 +02:00
parent 9b45d0e2eb
commit fecde3e8a1
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
View File

@@ -782,6 +782,16 @@ static QString getUnqualifiedName(const QString &name)
return nameComponents.last(); return nameComponents.last();
} }
static QString getPackage(const QString &name)
{
QStringList nameComponents = name.split('.');
if (nameComponents.size() < 2)
return QString();
nameComponents.removeLast();
return nameComponents.join(QLatin1String("."));
}
bool NodeMetaInfoPrivate::cleverCheckType(const QString &otherType) const bool NodeMetaInfoPrivate::cleverCheckType(const QString &otherType) const
{ {
if (otherType == qualfiedTypeName()) if (otherType == qualfiedTypeName())
@@ -790,13 +800,9 @@ bool NodeMetaInfoPrivate::cleverCheckType(const QString &otherType) const
if (isFileComponent()) if (isFileComponent())
return false; return false;
QStringList split = otherType.split('.'); const QString typeName = getUnqualifiedName(otherType);
QString package; const QString package = getPackage(otherType);
QString typeName = otherType;
if (split.count() > 1) {
package = split.first();
typeName = split.at(1);
}
if (cppPackageName() == package) if (cppPackageName() == package)
return QString(package + '.' + typeName) == cppPackageName() + '.' + getUnqualifiedName(qualfiedTypeName()); return QString(package + '.' + typeName) == cppPackageName() + '.' + getUnqualifiedName(qualfiedTypeName());