Merge remote-tracking branch 'origin/3.4'

Conflicts:
	plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp

Change-Id: I0362a5bb2a44c2608c2c074df45fffa022446cc4
This commit is contained in:
Eike Ziller
2015-05-07 14:40:11 +02:00
5 changed files with 14 additions and 8 deletions

View File

@@ -52,6 +52,8 @@ public:
bool startEngine();
void stopEngine();
bool success() const { return m_success; } // For testing.
signals:
void newDiagnosticsAvailable(const QList<Diagnostic> &diagnostics);
@@ -80,6 +82,7 @@ private:
int m_initialFilesToProcessSize;
int m_filesAnalyzed;
int m_filesNotAnalyzed;
bool m_success;
};
} // namespace Internal