From f630f49924958b0f99357a956dbccac245e2d3f0 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 22 Apr 2022 14:27:22 +0200 Subject: [PATCH] QtQuickCompilerAspect: Compile fix Amends 5da8695dca9106f1176bef86e920f61ef3d20071 Change-Id: I532df0d3488750f5792f4ec09558d48d7e3ed752 Reviewed-by: Christian Stenger --- src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 2 +- .../qmakeprojectmanager/qmakebuildconfiguration.cpp | 2 +- src/plugins/qtsupport/qtbuildaspects.cpp | 8 ++------ src/plugins/qtsupport/qtbuildaspects.h | 3 +-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 2e242fa126f..db42f15db18 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -136,7 +136,7 @@ QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Utils::Id id) connect(qmlDebuggingAspect, &QtSupport::QmlDebuggingAspect::changed, this, &QbsBuildConfiguration::qbsConfigurationChanged); - const auto qtQuickCompilerAspect = addAspect(); + const auto qtQuickCompilerAspect = addAspect(qmlDebuggingAspect); qtQuickCompilerAspect->setKit(target->kit()); connect(qtQuickCompilerAspect, &QtSupport::QtQuickCompilerAspect::changed, this, &QbsBuildConfiguration::qbsConfigurationChanged); diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index d3683127ad9..9bd5ec16c37 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -197,7 +197,7 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Utils::Id id) qmakeBuildSystem()->scheduleUpdateAllNowOrLater(); }); - const auto qtQuickCompilerAspect = addAspect(); + const auto qtQuickCompilerAspect = addAspect(qmlDebuggingAspect); qtQuickCompilerAspect->setKit(target->kit()); connect(qtQuickCompilerAspect, &QtQuickCompilerAspect::changed, this, [this] { emit useQtQuickCompilerChanged(); diff --git a/src/plugins/qtsupport/qtbuildaspects.cpp b/src/plugins/qtsupport/qtbuildaspects.cpp index fcd7b213c16..003ec03c9e5 100644 --- a/src/plugins/qtsupport/qtbuildaspects.cpp +++ b/src/plugins/qtsupport/qtbuildaspects.cpp @@ -76,7 +76,8 @@ void QmlDebuggingAspect::addToLayout(LayoutBuilder &builder) changeHandler(); } -QtQuickCompilerAspect::QtQuickCompilerAspect() +QtQuickCompilerAspect::QtQuickCompilerAspect(QmlDebuggingAspect *qmlAspect) + : m_qmlDebuggingAspect(qmlAspect) { setSettingsKey("QtQuickCompiler"); setDisplayName(tr("Qt Quick Compiler:")); @@ -114,9 +115,4 @@ void QtQuickCompilerAspect::addToLayout(LayoutBuilder &builder) changeHandler(); } -void QtQuickCompilerAspect::acquaintSiblings(const AspectContainer &siblings) -{ - m_qmlDebuggingAspect = siblings.aspect(); -} - } // namespace QtSupport diff --git a/src/plugins/qtsupport/qtbuildaspects.h b/src/plugins/qtsupport/qtbuildaspects.h index 428f9dc811a..8e84723914f 100644 --- a/src/plugins/qtsupport/qtbuildaspects.h +++ b/src/plugins/qtsupport/qtbuildaspects.h @@ -50,13 +50,12 @@ class QTSUPPORT_EXPORT QtQuickCompilerAspect : public Utils::TriStateAspect { Q_OBJECT public: - QtQuickCompilerAspect(); + QtQuickCompilerAspect(QmlDebuggingAspect *qmlAspect); void setKit(const ProjectExplorer::Kit *kit) { m_kit = kit; } private: void addToLayout(Utils::LayoutBuilder &builder) override; - void acquaintSiblings(const Utils::AspectContainer &siblings) override; const ProjectExplorer::Kit *m_kit = nullptr; const QmlDebuggingAspect *m_qmlDebuggingAspect = nullptr;