diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2017-12-07 16:25:47 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-05-22 15:21:54 +0000 |
commit | fdccc542754bc5361b8391ecd3902a88a84ab3cf (patch) | |
tree | 4d2e8c6ccbdbd11093d80ced48f0efd4c5f155e1 /src/plugins/cmakeprojectmanager/cmakeproject.cpp | |
parent | dd9c7de89a8bf876d3d7f7e98c55ac428539a4c8 (diff) | |
download | qt-creator-fdccc542754bc5361b8391ecd3902a88a84ab3cf.tar.gz |
server-mode: Always try to read CMakeCache, even after error
Change-Id: Ib3d4fb5ac14340a7f706e4a1d8a0cbdc420d01d1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeproject.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeproject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index aeed2af7ea..b55d48481c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -106,6 +106,7 @@ CMakeProject::CMakeProject(const FileName &fileName) : Project(Constants::CMAKEM CMakeBuildConfiguration *bc = activeBc(this); if (bc && bc == m_buildDirManager.buildConfiguration()) { bc->setError(msg); + bc->setConfigurationFromCMake(m_buildDirManager.takeCMakeConfiguration()); handleParsingError(bc); } }); |