diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-03-01 14:38:59 +0100 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-03-01 17:21:03 +0100 |
| commit | 26a3014ef5f2563dd78a3f41b1367eb011e4a206 (patch) | |
| tree | b8870857a18a45aecc71f4109be53737f07bfb27 /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | |
| parent | 1178d623d53317fbd5be4674ba8183b197f57113 (diff) | |
| download | qt-creator-26a3014ef5f2563dd78a3f41b1367eb011e4a206.tar.gz | |
QmlDesigner.metaInfo: fixes comparing versions
Also some cleanup.
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index fd456bcdae..837f1b531d 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -667,7 +667,8 @@ bool NodeMetaInfoPrivate::cleverCheckType(const QString &otherType) const const LanguageUtils::FakeMetaObject::Export exp = getQmlObjectValue()->metaObject()->exportInPackage(package); const QString convertedName = exp.type; - return QString(package + "/" + typeName) == QString(package + "/" + convertedName); + + return typeName == convertedName; } QVariant::Type NodeMetaInfoPrivate::variantTypeId(const QString &properyName) const @@ -997,9 +998,11 @@ QString NodeMetaInfo::componentFileName() const bool NodeMetaInfo::availableInVersion(int majorVersion, int minorVersion) const { - return ((majorVersion > m_privateData->majorVersion()) - || (majorVersion == m_privateData->majorVersion() && minorVersion >= m_privateData->minorVersion())) - || (majorVersion == -1 && minorVersion == -1); + if (majorVersion == -1 && minorVersion == -1) + return true; + + return (m_privateData->majorVersion() >= majorVersion) + || (majorVersion == m_privateData->majorVersion() && m_privateData->minorVersion() >= minorVersion); } bool NodeMetaInfo::isSubclassOf(const QString &type, int majorVersion, int minorVersion) const |