diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-05-30 12:03:27 +0000 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-05-30 12:06:54 +0000 |
| commit | 8405a16179e8a3d95841dce0cfbd0b8480dfd48b (patch) | |
| tree | e562d3216d5025278d63d46dd355e95c8b4ddaa6 | |
| parent | 0043c721c254607009b88732ec0d13f2af1f1191 (diff) | |
| download | qt-creator-8405a16179e8a3d95841dce0cfbd0b8480dfd48b.tar.gz | |
Revert "CMake: Pass STATIC types on cmake execution"
I have missed that this change was headed for 4.0 instead
of master. It breaks the build there.
This reverts commit 0043c721c254607009b88732ec0d13f2af1f1191.
Change-Id: Ia359798c2636b2b4699de9cc73484ec12a757601
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/builddirmanager.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp index f1a46dab4a..432e28cfba 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp +++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp @@ -82,9 +82,6 @@ static QStringList toArguments(const CMakeConfig &config, const ProjectExplorer: case CMakeConfigItem::INTERNAL: a.append(QLatin1String(":INTERNAL=")); break; - case CMakeConfigItem::STATIC: - a.append(QLatin1String(":STATIC=")); - break; } a.append(i.expandedValue(k)); |