diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-13 10:54:42 +0200 |
| commit | 428fcb476ba2c5bbe1d16dfe437e510dafce1777 (patch) | |
| tree | 10b130ef79d87dd1339004857c8f1e31e29c3f95 /src/plugins/autotoolsprojectmanager | |
| parent | 9e29a32e1ab3af42a4d70984449ba33b3092a50b (diff) | |
| parent | f4594c922fe3ffcfaf715cf09622ba48c3d1d620 (diff) | |
| download | qt-creator-428fcb476ba2c5bbe1d16dfe437e510dafce1777.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/libs/utils/settingsaccessor.cpp
src/plugins/autotest/autotestplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/makestep.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index 596c2a025b..222978d44a 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -65,9 +65,6 @@ MakeStepFactory::MakeStepFactory() registerStep<MakeStep>(MAKE_STEP_ID); setDisplayName(tr("Make", "Display name for AutotoolsProjectManager::MakeStep id.")); setSupportedProjectType(AUTOTOOLS_PROJECT_ID); - setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_BUILD, - ProjectExplorer::Constants::BUILDSTEPS_CLEAN, - ProjectExplorer::Constants::BUILDSTEPS_DEPLOY}); } // MakeStep |