From b52251099d8e54145a89eac9cc625a2baeac1bdf Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 5 Dec 2018 10:26:35 +0100 Subject: [PATCH] ClangTools: Fix plugin tests for clang 7 Change-Id: I52e7a822b03a989f9a01c6e19237d195781562e2 Reviewed-by: Ivan Donchevskii Reviewed-by: Marco Bubke --- src/plugins/clangtools/clangtoolsunittests.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/plugins/clangtools/clangtoolsunittests.cpp b/src/plugins/clangtools/clangtoolsunittests.cpp index eed554633a0..7cf401aa0e6 100644 --- a/src/plugins/clangtools/clangtoolsunittests.cpp +++ b/src/plugins/clangtools/clangtoolsunittests.cpp @@ -138,6 +138,8 @@ void ClangToolsUnitTests::testProject_data() QTest::addColumn("projectFilePath"); QTest::addColumn("expectedDiagCount"); + // For the simple project, we expect the following warning: + // warning: use nullptr [modernize-use-nullptr] addTestRow("simple/simple.qbs", 1); addTestRow("simple/simple.pro", 1); @@ -147,8 +149,12 @@ void ClangToolsUnitTests::testProject_data() addTestRow("stdc++11-includes/stdc++11-includes.qbs", 0); addTestRow("stdc++11-includes/stdc++11-includes.pro", 0); - addTestRow("qt-widgets-app/qt-widgets-app.qbs", 0); - addTestRow("qt-widgets-app/qt-widgets-app.pro", 0); + // For qt-widgets-app, we expect the following warning for "a.exec()", + // "a" being the QApplication object: + // warning: static member accessed through instance + // [readability-static-accessed-through-instance] + addTestRow("qt-widgets-app/qt-widgets-app.qbs", 1); + addTestRow("qt-widgets-app/qt-widgets-app.pro", 1); addTestRow("qt-essential-includes/qt-essential-includes.qbs", 0); addTestRow("qt-essential-includes/qt-essential-includes.pro", 0);