From 5b13fb2168b87c35334d97f2e97afd9eb0404e2b Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 23 Mar 2021 09:58:55 +0100 Subject: [PATCH] QtQuickCompilerAspect: Use better connection guard object The aspect may outlive its widgets. Change-Id: I93d742e15277f64d1919739a2244736fb294e5b0 Reviewed-by: David Schulz --- src/plugins/qtsupport/qtbuildaspects.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/plugins/qtsupport/qtbuildaspects.cpp b/src/plugins/qtsupport/qtbuildaspects.cpp index e2000048fed..133da9384d6 100644 --- a/src/plugins/qtsupport/qtbuildaspects.cpp +++ b/src/plugins/qtsupport/qtbuildaspects.cpp @@ -70,8 +70,8 @@ void QmlDebuggingAspect::addToLayout(LayoutBuilder &builder) if (warningLabel->parentWidget()) warningLabel->setVisible(warningLabelsVisible); }; - connect(KitManager::instance(), &KitManager::kitsChanged, this, changeHandler); - connect(this, &QmlDebuggingAspect::changed, this, changeHandler); + connect(KitManager::instance(), &KitManager::kitsChanged, warningLabel, changeHandler); + connect(this, &QmlDebuggingAspect::changed, warningLabel, changeHandler); changeHandler(); } @@ -105,13 +105,11 @@ void QtQuickCompilerAspect::addToLayout(LayoutBuilder &builder) if (warningLabel->parentWidget()) warningLabel->setVisible(warningLabelsVisible); }; - connect(KitManager::instance(), &KitManager::kitsChanged, this, changeHandler); - connect(this, &QmlDebuggingAspect::changed, this, changeHandler); - connect(this, &QtQuickCompilerAspect::changed, this, changeHandler); - if (m_qmlDebuggingAspect) { - connect(m_qmlDebuggingAspect, &QmlDebuggingAspect::changed, this, - changeHandler); - } + connect(KitManager::instance(), &KitManager::kitsChanged, warningLabel, changeHandler); + connect(this, &QmlDebuggingAspect::changed, warningLabel, changeHandler); + connect(this, &QtQuickCompilerAspect::changed, warningLabel, changeHandler); + if (m_qmlDebuggingAspect) + connect(m_qmlDebuggingAspect, &QmlDebuggingAspect::changed, warningLabel, changeHandler); changeHandler(); }