diff --git a/src/plugins/clangtools/diagnosticconfigswidget.cpp b/src/plugins/clangtools/diagnosticconfigswidget.cpp index c9fbfa1bd7f..3d3ca943a7e 100644 --- a/src/plugins/clangtools/diagnosticconfigswidget.cpp +++ b/src/plugins/clangtools/diagnosticconfigswidget.cpp @@ -808,7 +808,8 @@ private: } } - QModelIndex indexForCheck(const QString &check) const { + QModelIndex indexForCheck(const QString &check) const override + { if (check == "*") return index(0, 0, QModelIndex()); diff --git a/tests/auto/valgrind/memcheck/modeldemo.cpp b/tests/auto/valgrind/memcheck/modeldemo.cpp index eec6c16ae81..04735fc5f40 100644 --- a/tests/auto/valgrind/memcheck/modeldemo.cpp +++ b/tests/auto/valgrind/memcheck/modeldemo.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -32,7 +33,7 @@ int main(int argc, char *argv[]) ValgrindProcess runner; runner.setValgrindCommand({VALGRIND_FAKE_PATH, {"-i", PARSERTESTS_DATA_DIR "/memcheck-output-sample1.xml"}}); - ModelDemo demo(&runner); + ModelDemo demo; QObject::connect(&runner, &ValgrindProcess::processErrorReceived, &app, [](const QString &err) { qDebug() << err; }); diff --git a/tests/auto/valgrind/memcheck/modeldemo.h b/tests/auto/valgrind/memcheck/modeldemo.h index 6694bc57fe1..227f859c9db 100644 --- a/tests/auto/valgrind/memcheck/modeldemo.h +++ b/tests/auto/valgrind/memcheck/modeldemo.h @@ -12,17 +12,14 @@ #include #include #include -#include class ModelDemo : public QObject { Q_OBJECT public: - explicit ModelDemo(Valgrind::ValgrindProcess *r, QObject *parent = 0) + explicit ModelDemo(QObject *parent = 0) : QObject(parent) - , runner(r) - { - } + {} Valgrind::XmlProtocol::StackModel* stackModel; @@ -35,7 +32,4 @@ public Q_SLOTS: qDebug() << idx.row() << err.what(); stackModel->setError(err); } - -private: - Valgrind::ValgrindProcess *runner; };