forked from qt-creator/qt-creator
ProjectExplorer: Un-seat NamedWidget from ProjectSettingsWidget again
Amends 7954c4cc69
.
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>
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
|
|
||||||
NamedWidget::NamedWidget(const QString &displayName, QWidget *parent)
|
NamedWidget::NamedWidget(const QString &displayName, QWidget *parent)
|
||||||
: ProjectSettingsWidget(parent), m_displayName(displayName)
|
: QWidget(parent), m_displayName(displayName)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4,13 +4,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "projectexplorer_export.h"
|
#include "projectexplorer_export.h"
|
||||||
#include "projectsettingswidget.h"
|
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
|
|
||||||
class PROJECTEXPLORER_EXPORT NamedWidget : public ProjectSettingsWidget
|
class PROJECTEXPLORER_EXPORT NamedWidget : public QWidget
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit NamedWidget(const QString &displayName, QWidget *parent = nullptr);
|
explicit NamedWidget(const QString &displayName, QWidget *parent = nullptr);
|
||||||
|
@@ -372,10 +372,10 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class ProjectEnvironmentWidget : public NamedWidget
|
class ProjectEnvironmentWidget : public ProjectSettingsWidget
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit ProjectEnvironmentWidget(Project *project) : NamedWidget(Tr::tr("Project Environment"))
|
explicit ProjectEnvironmentWidget(Project *project)
|
||||||
{
|
{
|
||||||
setUseGlobalSettingsCheckBoxVisible(false);
|
setUseGlobalSettingsCheckBoxVisible(false);
|
||||||
setUseGlobalSettingsLabelVisible(false);
|
setUseGlobalSettingsLabelVisible(false);
|
||||||
@@ -399,7 +399,7 @@ public:
|
|||||||
ProjectEnvironmentPanelFactory()
|
ProjectEnvironmentPanelFactory()
|
||||||
{
|
{
|
||||||
setPriority(60);
|
setPriority(60);
|
||||||
setDisplayName(Tr::tr("Environment"));
|
setDisplayName(Tr::tr("Project Environment"));
|
||||||
setCreateWidgetFunction([](Project *project) {
|
setCreateWidgetFunction([](Project *project) {
|
||||||
return new ProjectEnvironmentWidget(project);
|
return new ProjectEnvironmentWidget(project);
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user