From 312ee5fdf4807e18cbec362eb25746af8da17bd5 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Fri, 15 Aug 2014 11:04:37 +0200
Subject: [PATCH] QmlDesigner.ImportManager: Fix comparison operator
The comparison operator was not consistent if comparing the same url.
This could trigger an assert for msvc debug builds.
Change-Id: Ia9febd7ffd7d0f4dbb64184931a526e61f020672
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
.../qmldesigner/components/importmanager/importswidget.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
index e58ff77120..9768b4a997 100644
--- a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
+++ b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
@@ -92,6 +92,9 @@ void ImportsWidget::removeUsedImports()
static bool importLess(const Import &firstImport, const Import &secondImport)
{
+ if (firstImport.url() == secondImport.url())
+ return firstImport.toString() < secondImport.toString();
+
if (firstImport.url() == "QtQuick")
return true;
--
GitLab