From b6ed781c2838b6733c85950f5e06d099b7c68eb6 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 21 Nov 2019 14:19:19 +0100 Subject: [PATCH] ClangTools: Simplify clazy test ...in order to not run into parse errors in qstring.h involving * C++17 * >= Qt 5.14 * stdlibc++ of gcc 5.3/5.4 Change-Id: I8c06f90a88a4dd18503a81b68433604eb3bc9556 Reviewed-by: Cristian Adam Reviewed-by: Christian Stenger --- .../clangtools/clangtoolsunittests.cpp | 2 +- .../clangtidy_clazy/clazy_example.cpp | 20 ++++++------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/plugins/clangtools/clangtoolsunittests.cpp b/src/plugins/clangtools/clangtoolsunittests.cpp index 609d666ed54..cd20781c172 100644 --- a/src/plugins/clangtools/clangtoolsunittests.cpp +++ b/src/plugins/clangtools/clangtoolsunittests.cpp @@ -159,7 +159,7 @@ void ClangToolsUnitTests::testProject_data() // Test that tidy and clazy diagnostics are emitted for the same project. addTestRow("clangtidy_clazy/clangtidy_clazy.pro", 1 /*tidy*/ + 1 /*clazy*/, - configFor("misc-unconventional-assign-operator", "base-class-event")); + configFor("misc-unconventional-assign-operator", "qgetenv")); } void ClangToolsUnitTests::addTestRow(const QByteArray &relativeFilePath, diff --git a/src/plugins/clangtools/unit-tests/clangtidy_clazy/clazy_example.cpp b/src/plugins/clangtools/unit-tests/clangtidy_clazy/clazy_example.cpp index 5cd980d24c4..c692e5e697c 100644 --- a/src/plugins/clangtools/unit-tests/clangtidy_clazy/clazy_example.cpp +++ b/src/plugins/clangtools/unit-tests/clangtidy_clazy/clazy_example.cpp @@ -23,19 +23,11 @@ ** ****************************************************************************/ -#include +#include +#include -// -Wclazy-ctor-missing-parent-argument -class TestObject : public QObject +void test() { - Q_OBJECT - -public: - TestObject(); - - bool event(QEvent *) override - { - // -Wclazy-base-class-event - return false; - } -}; + // -Wclazy-qgetenv + qgetenv("Foo").isEmpty(); +}