2 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/projectconfigurationaspects.cpp b/src/plugins/projectexplorer/projectconfigurationaspects.cpp
index f312ed90ca..59d897dccd 100644
--- a/src/plugins/projectexplorer/projectconfigurationaspects.cpp
+++ b/src/plugins/projectexplorer/projectconfigurationaspects.cpp
@@ -61,9 +61,10 @@ public:
     bool m_value = false;
     bool m_defaultValue = false;
     bool m_enabled = true;
-    QString m_label;
+    QString m_labelText;
     QString m_tooltip;
     QPointer<QCheckBox> m_checkBox; // Owned by configuration widget
+    QPointer<QLabel> m_label; // Owned by configuration widget
 };
 
 class BaseSelectionAspectPrivate
@@ -501,10 +502,12 @@ void BaseBoolAspect::addToLayout(LayoutBuilder &builder)
     QTC_CHECK(!d->m_checkBox);
     d->m_checkBox = new QCheckBox();
     if (d->m_labelPlacement == LabelPlacement::AtCheckBox) {
-        d->m_checkBox->setText(d->m_label);
+        d->m_checkBox->setText(d->m_labelText);
         builder.addItem(new QLabel);
     } else {
-        builder.addItem(d->m_label);
+        d->m_label = new QLabel(d->m_labelText);
+        d->m_label->setToolTip(d->m_tooltip);
+        builder.addItem(d->m_label.data());
     }
     d->m_checkBox->setChecked(d->m_value);
     d->m_checkBox->setToolTip(d->m_tooltip);
@@ -549,9 +552,9 @@ void BaseBoolAspect::setValue(bool value)
         d->m_checkBox->setChecked(d->m_value);
 }
 
-void BaseBoolAspect::setLabel(const QString &label, LabelPlacement labelPlacement)
+void BaseBoolAspect::setLabel(const QString &labelText, LabelPlacement labelPlacement)
 {
-    d->m_label = label;
+    d->m_labelText = labelText;
     d->m_labelPlacement = labelPlacement;
 }
 
diff --git a/src/plugins/projectexplorer/projectconfigurationaspects.h b/src/plugins/projectexplorer/projectconfigurationaspects.h
index 956df8e5c5..e38517b77d 100644
--- a/src/plugins/projectexplorer/projectconfigurationaspects.h
+++ b/src/plugins/projectexplorer/projectconfigurationaspects.h
@@ -65,7 +65,7 @@ public:
     void setDefaultValue(bool defaultValue);
 
     enum class LabelPlacement { AtCheckBox, InExtraLabel };
-    void setLabel(const QString &label,
+    void setLabel(const QString &labelText,
                   LabelPlacement labelPlacement = LabelPlacement::InExtraLabel);
     void setToolTip(const QString &tooltip);
     void setEnabled(bool enabled);