feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: Fix creation of environment aspect widget

Browse Source 
This was forgotten in ae9fff17a1.

Task-number: QTCREATORBUG-18167
Change-Id: Ib1e3d06ee822dff6b991d967b2f68148cc9c55c6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2017-05-15 16:15:08 +02:00
parent f19de84e57
commit b9b3717007
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
View File

@@ -35,18 +35,15 @@ namespace RemoteLinux {
RemoteLinuxEnvironmentAspect::RemoteLinuxEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) : RemoteLinuxEnvironmentAspect::RemoteLinuxEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) :
ProjectExplorer::EnvironmentAspect(rc) ProjectExplorer::EnvironmentAspect(rc)
{ } {
setRunConfigWidgetCreator([this] { return new RemoteLinuxEnvironmentAspectWidget(this); });
}
RemoteLinuxEnvironmentAspect *RemoteLinuxEnvironmentAspect::create(ProjectExplorer::RunConfiguration *parent) const RemoteLinuxEnvironmentAspect *RemoteLinuxEnvironmentAspect::create(ProjectExplorer::RunConfiguration *parent) const
{ {
return new RemoteLinuxEnvironmentAspect(parent); return new RemoteLinuxEnvironmentAspect(parent);
} }
ProjectExplorer::RunConfigWidget *RemoteLinuxEnvironmentAspect::createConfigurationWidget()
{
return new RemoteLinuxEnvironmentAspectWidget(this);
}
QList<int> RemoteLinuxEnvironmentAspect::possibleBaseEnvironments() const QList<int> RemoteLinuxEnvironmentAspect::possibleBaseEnvironments() const
{ {
return QList<int>() << static_cast<int>(RemoteBaseEnvironment) return QList<int>() << static_cast<int>(RemoteBaseEnvironment)

2
src/plugins/remotelinux/remotelinuxenvironmentaspect.h
View File

@@ -30,7 +30,6 @@
#include <projectexplorer/environmentaspect.h> #include <projectexplorer/environmentaspect.h>
namespace RemoteLinux { namespace RemoteLinux {
class RemoteLinuxEnvironmentAspectWidget;
class REMOTELINUX_EXPORT RemoteLinuxEnvironmentAspect : public ProjectExplorer::EnvironmentAspect class REMOTELINUX_EXPORT RemoteLinuxEnvironmentAspect : public ProjectExplorer::EnvironmentAspect
{ {
@@ -39,7 +38,6 @@ class REMOTELINUX_EXPORT RemoteLinuxEnvironmentAspect : public ProjectExplorer::
public: public:
RemoteLinuxEnvironmentAspect(ProjectExplorer::RunConfiguration *rc); RemoteLinuxEnvironmentAspect(ProjectExplorer::RunConfiguration *rc);
RemoteLinuxEnvironmentAspect *create(ProjectExplorer::RunConfiguration *parent) const; RemoteLinuxEnvironmentAspect *create(ProjectExplorer::RunConfiguration *parent) const;
ProjectExplorer::RunConfigWidget *createConfigurationWidget();
QList<int> possibleBaseEnvironments() const; QList<int> possibleBaseEnvironments() const;
QString baseEnvironmentDisplayName(int base) const; QString baseEnvironmentDisplayName(int base) const;