diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-08-03 11:35:17 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-08-03 11:35:17 +0200 |
| commit | c9ba87b58b87dcdf0b1fb04f7dc65867fc573525 (patch) | |
| tree | 75bd729e8180634d582068ee46d25d900fa37706 /src/plugins/incredibuild | |
| parent | a1fbc1a4b7987b700e778c92026dadbd97f819e1 (diff) | |
| parent | 1f7960efe65c284cb954dc8b8e6b72f807b15a3c (diff) | |
Merge remote-tracking branch 'origin/11.0'
Conflicts:
src/plugins/beautifier/clangformat/clangformatsettings.cpp
src/shared/qbs
Change-Id: Ie614f036ef9529a3cae6366a9313eded988d725c
Diffstat (limited to 'src/plugins/incredibuild')
| -rw-r--r-- | src/plugins/incredibuild/commandbuilderaspect.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/incredibuild/commandbuilderaspect.cpp b/src/plugins/incredibuild/commandbuilderaspect.cpp index 5cfbac953b1..3eced7c144f 100644 --- a/src/plugins/incredibuild/commandbuilderaspect.cpp +++ b/src/plugins/incredibuild/commandbuilderaspect.cpp @@ -61,7 +61,8 @@ public: }; CommandBuilderAspect::CommandBuilderAspect(BuildStep *step) - : d(new CommandBuilderAspectPrivate(step)) + : BaseAspect(step) + , d(new CommandBuilderAspectPrivate(step)) { } |