diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-20 12:23:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 06:39:08 +0000 |
| commit | 1fb3de738bc700565c63559d253577c2f3984ea6 (patch) | |
| tree | ff3fea213333ead0f488b40ddbd1436af1b30d48 /plugins | |
| parent | 7326424349dc8df89d60644780e77a79cc0fd45f (diff) | |
Fix compilation with upstream changes
Change-Id: I22a770d936311250f86fa36980ab8e13a34111df
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/haskell/haskellrunconfiguration.h | 3 | ||||
| -rw-r--r-- | plugins/haskell/stackbuildstep.cpp | 4 | ||||
| -rw-r--r-- | plugins/haskell/stackbuildstep.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/haskell/haskellrunconfiguration.h b/plugins/haskell/haskellrunconfiguration.h index 445aa3a..a3da33a 100644 --- a/plugins/haskell/haskellrunconfiguration.h +++ b/plugins/haskell/haskellrunconfiguration.h @@ -29,6 +29,7 @@ #include <projectexplorer/runconfigurationaspects.h> #include <projectexplorer/runcontrol.h> +#include <utils/aspects.h> namespace Haskell { namespace Internal { @@ -57,7 +58,7 @@ private: {ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE}}; }; -class HaskellExecutableAspect : public ProjectExplorer::BaseStringAspect +class HaskellExecutableAspect : public Utils::StringAspect { Q_OBJECT diff --git a/plugins/haskell/stackbuildstep.cpp b/plugins/haskell/stackbuildstep.cpp index a1552d6..26c3006 100644 --- a/plugins/haskell/stackbuildstep.cpp +++ b/plugins/haskell/stackbuildstep.cpp @@ -68,9 +68,9 @@ StackBuildStep::StackBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id connect(buildConfiguration(), &BuildConfiguration::environmentChanged, this, updateEnvironment); } -BuildStepConfigWidget *StackBuildStep::createConfigWidget() +QWidget *StackBuildStep::createConfigWidget() { - return new BuildStepConfigWidget(this); + return new QWidget; } QString StackBuildStep::trDisplayName() diff --git a/plugins/haskell/stackbuildstep.h b/plugins/haskell/stackbuildstep.h index 4ef55ff..98938f5 100644 --- a/plugins/haskell/stackbuildstep.h +++ b/plugins/haskell/stackbuildstep.h @@ -37,7 +37,7 @@ class StackBuildStep : public ProjectExplorer::AbstractProcessStep public: StackBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + QWidget *createConfigWidget() override; static QString trDisplayName(); }; |