From ac8ada95ff40540d5e0f4baf639c0bad00e81784 Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Wed, 27 Apr 2011 15:04:28 -0300
Subject: Don't create cyclic graphs when there are QString, PySequence and
 PyObjects involved into a single overload.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewer: Renato Araújo <renato.filho@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>
---
 generator/overloaddata.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/generator/overloaddata.cpp b/generator/overloaddata.cpp
index c670209e5..6bb06fe57 100644
--- a/generator/overloaddata.cpp
+++ b/generator/overloaddata.cpp
@@ -330,7 +330,8 @@ void OverloadData::sortNextOverloads()
                 graph.addEdge(targetTypeId, qvariantIndex);
         } else if (checkQString && ov->argType()->indirections() > 0
             && targetTypeEntryName != "QString"
-            && targetTypeEntryName != "QByteArray") {
+            && targetTypeEntryName != "QByteArray"
+            && (!checkPyObject || targetTypeId != pyobjectIndex)) {
             if (!graph.containsEdge(qstringIndex, targetTypeId)) // Avoid cyclic dependency.
                 graph.addEdge(targetTypeId, qstringIndex);
         }
-- 
cgit v1.2.3