Merge remote-tracking branch 'origin/4.0'

 Conflicts:
	share/qtcreator/debugger/creatortypes.py
	src/plugins/beautifier/clangformat/clangformat.cpp

Change-Id: I1ab281c190767ced8a6ac2c026a121ea229a36cf

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index a076e9beba..b3b378cc4b 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -157,7 +157,7 @@ void MemcheckErrorFilterProxyModel::setAcceptedKinds(const QList<int> &acceptedK
 {
     if (m_acceptedKinds != acceptedKinds) {
         m_acceptedKinds = acceptedKinds;
-        invalidate();
+        invalidateFilter();
     }
 }
 
@@ -165,7 +165,7 @@ void MemcheckErrorFilterProxyModel::setFilterExternalIssues(bool filter)
 {
     if (m_filterExternalIssues != filter) {
         m_filterExternalIssues = filter;
-        invalidate();
+        invalidateFilter();
     }
 }