diff --git a/src/libs/qmljs/qmljscomponentversion.cpp b/src/libs/qmljs/qmljscomponentversion.cpp index ab1e6219ff2..23fabc20b0f 100644 --- a/src/libs/qmljs/qmljscomponentversion.cpp +++ b/src/libs/qmljs/qmljscomponentversion.cpp @@ -56,19 +56,19 @@ namespace QmlJS { bool operator<(const ComponentVersion &lhs, const ComponentVersion &rhs) { - return lhs.major() < rhs.major() - || (lhs.major() == rhs.major() && lhs.minor() < rhs.minor()); + return lhs.majorVersion() < rhs.majorVersion() + || (lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() < rhs.minorVersion()); } bool operator<=(const ComponentVersion &lhs, const ComponentVersion &rhs) { - return lhs.major() < rhs.major() - || (lhs.major() == rhs.major() && lhs.minor() <= rhs.minor()); + return lhs.majorVersion() < rhs.majorVersion() + || (lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() <= rhs.minorVersion()); } bool operator==(const ComponentVersion &lhs, const ComponentVersion &rhs) { - return lhs.major() == rhs.major() && lhs.minor() == rhs.minor(); + return lhs.majorVersion() == rhs.majorVersion() && lhs.minorVersion() == rhs.minorVersion(); } bool operator!=(const ComponentVersion &lhs, const ComponentVersion &rhs) diff --git a/src/libs/qmljs/qmljscomponentversion.h b/src/libs/qmljs/qmljscomponentversion.h index 5f027fbc865..565a0ebff04 100644 --- a/src/libs/qmljs/qmljscomponentversion.h +++ b/src/libs/qmljs/qmljscomponentversion.h @@ -46,13 +46,6 @@ public: ComponentVersion(int major, int minor); ~ComponentVersion(); - int major() const - { return _major; } - int minor() const - { return _minor; } - - // something in the GNU headers introduces the major() and minor() defines, - // use these two to disambiguate when necessary int majorVersion() const { return _major; } int minorVersion() const diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 6e1c7483c9f..7544d452eee 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -255,8 +255,8 @@ public: typeName = fixUpPackeNameForQtQuick(qmlValue->packageName()) + QLatin1String("/") + qmlValue->className(); //### todo this is just a hack to support QtQuick 1.0 - majorVersion = fixUpMajorVersionForQtQuick(qmlValue->packageName(), qmlValue->version().major()); - minorVersion = fixUpMinorVersionForQtQuick(qmlValue->packageName(), qmlValue->version().minor()); + majorVersion = fixUpMajorVersionForQtQuick(qmlValue->packageName(), qmlValue->version().majorVersion()); + minorVersion = fixUpMinorVersionForQtQuick(qmlValue->packageName(), qmlValue->version().minorVersion()); } else { for (UiQualifiedId *iter = astTypeNode; iter; iter = iter->next) if (!iter->next && iter->name)