From 3468a5c29829da064c40730653646b6264201759 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 2 Dec 2024 15:25:53 +0100
Subject: [PATCH] ProjectExplorer: Un-seat NamedWidget from
 ProjectSettingsWidget again

Amends 7954c4cc6998.

The NamedWidgets are shown on the BuildSettings page, the
ProjectSettingsWidgets on the lower left in ProjectMode,
they are not really related.

Change-Id: I64c3e95b82bb49932823ae0a8dae052d3a6a09c9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/namedwidget.cpp     | 2 +-
 src/plugins/projectexplorer/namedwidget.h       | 3 +--
 src/plugins/projectexplorer/projectexplorer.cpp | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/projectexplorer/namedwidget.cpp b/src/plugins/projectexplorer/namedwidget.cpp
index c76a6dab771..1047224e663 100644
--- a/src/plugins/projectexplorer/namedwidget.cpp
+++ b/src/plugins/projectexplorer/namedwidget.cpp
@@ -6,7 +6,7 @@
 namespace ProjectExplorer {
 
 NamedWidget::NamedWidget(const QString &displayName, QWidget *parent)
-    : ProjectSettingsWidget(parent), m_displayName(displayName)
+    : QWidget(parent), m_displayName(displayName)
 {
 }
 
diff --git a/src/plugins/projectexplorer/namedwidget.h b/src/plugins/projectexplorer/namedwidget.h
index 2551c8b56de..e67854d9230 100644
--- a/src/plugins/projectexplorer/namedwidget.h
+++ b/src/plugins/projectexplorer/namedwidget.h
@@ -4,13 +4,12 @@
 #pragma once
 
 #include "projectexplorer_export.h"
-#include "projectsettingswidget.h"
 
 #include <QWidget>
 
 namespace ProjectExplorer {
 
-class PROJECTEXPLORER_EXPORT NamedWidget : public ProjectSettingsWidget
+class PROJECTEXPLORER_EXPORT NamedWidget : public QWidget
 {
 public:
     explicit NamedWidget(const QString &displayName, QWidget *parent = nullptr);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 6d3ca9fb772..7f9f09201dd 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -372,10 +372,10 @@ public:
     }
 };
 
-class ProjectEnvironmentWidget : public NamedWidget
+class ProjectEnvironmentWidget : public ProjectSettingsWidget
 {
 public:
-    explicit ProjectEnvironmentWidget(Project *project) : NamedWidget(Tr::tr("Project Environment"))
+    explicit ProjectEnvironmentWidget(Project *project)
     {
         setUseGlobalSettingsCheckBoxVisible(false);
         setUseGlobalSettingsLabelVisible(false);
@@ -399,7 +399,7 @@ public:
     ProjectEnvironmentPanelFactory()
     {
         setPriority(60);
-        setDisplayName(Tr::tr("Environment"));
+        setDisplayName(Tr::tr("Project Environment"));
         setCreateWidgetFunction([](Project *project) {
             return new ProjectEnvironmentWidget(project);
         });