diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-26 09:00:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-26 09:00:05 +0200 |
| commit | 227904d4a691b99789f1dc43f9b31d857279c896 (patch) | |
| tree | 37d8477c650560b7a94f508526a3bf93343ecb68 /src/plugins/clangtools | |
| parent | 63df649655a857599cc14dbe29a3e1647d927fb9 (diff) | |
| parent | e71c0b7fe206d607c94bda0cd2dc5d7ed249101b (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
Diffstat (limited to 'src/plugins/clangtools')
| -rw-r--r-- | src/plugins/clangtools/clangtoolruncontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index 2d077a1502..5eca0a6515 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -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() |