feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Change-Id: I95dba3037fe5630cafc3c1e45c579ff18730262c
This commit is contained in:
Eike Ziller
2022-04-04 09:10:47 +02:00
parent 50fddf1128 a32c857ded
commit 6a1e3f5e6e
25 changed files with 377 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -514,7 +514,7 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
if (restoredFromBackup)
project()->addIssue(
CMakeProject::IssueType::Error,
CMakeProject::IssueType::Warning,
tr("<b>CMake configuration failed<b>"
"<p>The backup of the previous configuration has been restored.</p>"
"<p>Issues and \"Projects > Build\" settings "
@@ -532,7 +532,7 @@ void CMakeBuildSystem::combineScanAndParse(bool restoredFromBackup)
updateFallbackProjectData();
project()->addIssue(
CMakeProject::IssueType::Error,
CMakeProject::IssueType::Warning,
tr("<b>Failed to load project<b>"
"<p>Issues and \"Projects > Build\" settings "
"show more information about the failure.</p"));