From 4beab5d3433c07f61269596870d9ad1c1729cd2b Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 11 Nov 2013 14:37:03 +0100 Subject: [PATCH] QmlDesigner: Change import compare function Before Import("QtQuick") == Import("QtQuick", "2.1") was false but now it is true. Change-Id: I7866f261d372020902a451df19a65080e7ae5ef4 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designercore/model/import.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/import.cpp b/src/plugins/qmldesigner/designercore/model/import.cpp index b2a46ea264c..39b0f63b55c 100644 --- a/src/plugins/qmldesigner/designercore/model/import.cpp +++ b/src/plugins/qmldesigner/designercore/model/import.cpp @@ -92,7 +92,7 @@ QString Import::toString(bool skipAlias) const bool Import::operator==(const Import &other) const { - return url() == other.url() && file() == other.file() && version() == other.version() && alias() == other.alias(); + return url() == other.url() && file() == other.file() && (version() == other.version() || version().isEmpty() || other.version().isEmpty()); } bool Import::isSameModule(const Import &other) const