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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
This commit is contained in:
Eike Ziller
2020-05-26 09:00:05 +02:00
parent 63df649655 e71c0b7fe2
commit 227904d4a6
13 changed files with 65 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangtools/clangtoolruncontrol.cpp
View File

@@ -448,7 +448,7 @@ void ClangToolRunWorker::finalize()
{
const QString toolName = tool()->name();
if (m_filesNotAnalyzed.size() != 0) {
appendMessage(tr("Error: Failed to analyze %1 files.").arg(m_filesAnalyzed.size()),
appendMessage(tr("Error: Failed to analyze %1 files.").arg(m_filesNotAnalyzed.size()),
ErrorMessageFormat);
Target *target = runControl()->target();
if (target && target->activeBuildConfiguration() && !target->activeBuildConfiguration()->buildDirectory().exists()