From 160fe9fefda4078538e4719762f76f37121de1d3 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@digia.com>
Date: Fri, 11 Oct 2013 17:48:08 +0200
Subject: Fix broken dependency resolver

 * dependencies can have versions
 * remove version before sorting dependecy graph

Change-Id: Iceefd7939fffcb5c5ad94d0e915de9e2d6eba172
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 src/libs/installer/packagemanagercore_p.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 743e41490..a8978bb52 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -2397,9 +2397,11 @@ OperationList PackageManagerCorePrivate::sortOperationsBasedOnComponentDependenc
 
     // create the complete component graph
     Graph<QString> componentGraph;
+    const QRegExp dash(QLatin1String("-.*"));
     foreach (const Component* componentNode, m_core->availableComponents()) {
         componentGraph.addNode(componentNode->name());
-        componentGraph.addEdges(componentNode->name(), componentNode->dependencies());
+        const QStringList dependencies = componentNode->dependencies().replaceInStrings(dash,QString());
+        componentGraph.addEdges(componentNode->name(), dependencies);
     }
 
     foreach (const QString &componentName, componentGraph.sort())
-- 
cgit v1.2.3