diff options
author | Cristian Adam <cristian.adam@qt.io> | 2021-06-03 12:08:16 +0200 |
---|---|---|
committer | Cristian Adam <cristian.adam@qt.io> | 2021-06-08 09:35:22 +0000 |
commit | 80d18c1e5746f912dfeeff84cc38745446b37009 (patch) | |
tree | ac33a8b069f13606f0cd5decfc4544dbe67e38e1 | |
parent | 1b3a4e1fc65ba39682912aee5d94cd30e5b9c84c (diff) |
CMakePM: Do backup/restore configuration for all casesv4.15.1
When "Auto create build directories" is not checked, then the first
configuration is done in /tmp, which is covered by workDirectory.
Change-Id: Iad65b4776433ce296bd2561195fcf1bb6f8ace1d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | src/plugins/cmakeprojectmanager/fileapireader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index a4a2471073..e5172e6f6e 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -312,8 +312,8 @@ void FileApiReader::endState(const QFileInfo &replyFi) void FileApiReader::makeBackupConfiguration(bool store) { - FilePath reply = m_parameters.buildDirectory.pathAppended(".cmake/api/v1/reply"); - FilePath replyPrev = m_parameters.buildDirectory.pathAppended(".cmake/api/v1/reply.prev"); + FilePath reply = m_parameters.workDirectory.pathAppended(".cmake/api/v1/reply"); + FilePath replyPrev = m_parameters.workDirectory.pathAppended(".cmake/api/v1/reply.prev"); if (!store) std::swap(reply, replyPrev); @@ -327,8 +327,8 @@ void FileApiReader::makeBackupConfiguration(bool store) } - FilePath cmakeCacheTxt = m_parameters.buildDirectory.pathAppended("CMakeCache.txt"); - FilePath cmakeCacheTxtPrev = m_parameters.buildDirectory.pathAppended("CMakeCache.txt.prev"); + FilePath cmakeCacheTxt = m_parameters.workDirectory.pathAppended("CMakeCache.txt"); + FilePath cmakeCacheTxtPrev = m_parameters.workDirectory.pathAppended("CMakeCache.txt.prev"); if (!store) std::swap(cmakeCacheTxt, cmakeCacheTxtPrev); |