diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-11 10:35:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-11 10:35:49 +0100 |
| commit | 23ec56516e02796fe22c5c84d59a309d90234908 (patch) | |
| tree | 429e1ffc59cd926dbd4f688270be5bf9daa8629c /src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | |
| parent | adf70c1a84a92a4913b75c2347161317d093260d (diff) | |
| parent | b201c9be2b35256fd927ed16208479286093fdef (diff) | |
| download | qt-creator-23ec56516e02796fe22c5c84d59a309d90234908.tar.gz | |
Merge remote-tracking branch 'origin/3.4'
Conflicts:
src/plugins/coreplugin/coreplugin.cpp
Change-Id: I9aa6c61412e2ef4a91efe028296bcc2d075856d7
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index ea20cb580c..36a9c9eb06 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -279,7 +279,6 @@ CMakeBuildInfo *CMakeBuildConfigurationFactory::createBuildInfo(const ProjectExp k->addToEnvironment(info->environment); info->useNinja = false; info->sourceDirectory = sourceDir; - info->supportsShadowBuild = true; return info; } |