Merge branch 'master' of git://anongit.kde.org/clazy

2 files changed, 9 insertions, 1 deletions

diff --git a/src/checks/level1/nonpodstatic.cpp b/src/checks/level1/nonpodstatic.cpp
index f792eed7..05b510f7 100644
--- a/src/checks/level1/nonpodstatic.cpp
+++ b/src/checks/level1/nonpodstatic.cpp
@@ -28,6 +28,7 @@
 #include "MacroUtils.h"
 #include "QtUtils.h"
 #include "checkmanager.h"
+#include "ClazyContext.h"
 
 #include <clang/AST/DeclCXX.h>
 #include <clang/Lex/Lexer.h>
@@ -87,7 +88,7 @@ void NonPodStatic::VisitStmt(clang::Stmt *stm)
         }
     }
 
-    if (QtUtils::isBootstrapping(m_preprocessorOpts))
+    if (m_context->isQtDeveloper() && QtUtils::isBootstrapping(m_preprocessorOpts))
         return;
 
     const string className = recordDecl->getName();
diff --git a/src/checks/level2/qstring-allocations.cpp b/src/checks/level2/qstring-allocations.cpp
index 1ff1fcf4..dd0c0bef 100644
--- a/src/checks/level2/qstring-allocations.cpp
+++ b/src/checks/level2/qstring-allocations.cpp
@@ -29,6 +29,7 @@
 #include "StringUtils.h"
 #include "FixItUtils.h"
 #include "FunctionUtils.h"
+#include "QtUtils.h"
 #include "checkmanager.h"
 
 #include <clang/AST/DeclCXX.h>
@@ -69,6 +70,12 @@ QStringAllocations::QStringAllocations(const std::string &name, ClazyContext *co
 
 void QStringAllocations::VisitStmt(clang::Stmt *stm)
 {
+    if (m_context->isQtDeveloper() && QtUtils::isBootstrapping(m_preprocessorOpts)) {
+        // During bootstrap many QString::fromLatin1() are used instead of tr(), which causes
+        // much noise
+        return;
+    }
+
     VisitCtor(stm);
     VisitOperatorCall(stm);
     VisitFromLatin1OrUtf8(stm);