From 82bb8ce3ed1404f5f90b678d7ee4dfcda0fc15f3 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 21 Aug 2014 22:15:24 +0200 Subject: [PATCH] QmlDesigner: fix that we have too many updateActiveQtVersion() connections Change-Id: I3d9a9ba76d0da4def215541ccff02afc26e5e5f1 Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/integration/designdocument.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index f1a3a857b46..e2974a673d1 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -650,10 +650,9 @@ static inline ProjectExplorer::Kit *getActiveKit(DesignDocument *designDocument) if (!isFileInProject(designDocument, currentProject)) return 0; - designDocument->disconnect(designDocument, SLOT(updateActiveQtVersion())); - designDocument->connect(projectExplorer, SIGNAL(currentProjectChanged(ProjectExplorer::Project*)), designDocument, SLOT(updateActiveQtVersion())); + designDocument->connect(projectExplorer, SIGNAL(currentProjectChanged(ProjectExplorer::Project*)), designDocument, SLOT(updateActiveQtVersion()), Qt::UniqueConnection); - designDocument->connect(currentProject, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), designDocument, SLOT(updateActiveQtVersion())); + designDocument->connect(currentProject, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), designDocument, SLOT(updateActiveQtVersion()), Qt::UniqueConnection); ProjectExplorer::Target *target = currentProject->activeTarget(); @@ -661,7 +660,7 @@ static inline ProjectExplorer::Kit *getActiveKit(DesignDocument *designDocument) if (!target) return 0; - designDocument->connect(target, SIGNAL(kitChanged()), designDocument, SLOT(updateActiveQtVersion())); + designDocument->connect(target, SIGNAL(kitChanged()), designDocument, SLOT(updateActiveQtVersion()), Qt::UniqueConnection); return target->kit(); }