From 3c9346a219f5cfea3c94d209f87fa65d73e8579b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 10 Apr 2015 10:17:44 +0200 Subject: [PATCH 1/3] De-QObjectify Settings class. Change-Id: I67d6caff28f1196bec16cfef4dda6354700130f0 Reviewed-by: Nikolai Kosjar --- .../clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp | 4 ++-- plugins/clangstaticanalyzer/clangstaticanalyzersettings.h | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp index 6b8b0f0cee2..ced034aa6c4 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp @@ -35,14 +35,14 @@ ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget( m_ui->clangExecutableChooser->setPath(settings->clangExecutable()); connect(m_ui->clangExecutableChooser, &Utils::PathChooser::changed, - m_settings, &ClangStaticAnalyzerSettings::setClangExecutable); + [settings](const QString &path) { settings->setClangExecutable(path); }); m_ui->simultaneousProccessesSpinBox->setValue(settings->simultaneousProcesses()); m_ui->simultaneousProccessesSpinBox->setMinimum(1); m_ui->simultaneousProccessesSpinBox->setMaximum(QThread::idealThreadCount()); connect(m_ui->simultaneousProccessesSpinBox, static_cast(&QSpinBox::valueChanged), - m_settings, &ClangStaticAnalyzerSettings::setSimultaneousProcesses); + [settings](int count) { settings->setSimultaneousProcesses(count); }); } ClangStaticAnalyzerConfigWidget::~ClangStaticAnalyzerConfigWidget() diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h index 71c4c218642..acd75458895 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h +++ b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h @@ -19,16 +19,13 @@ #ifndef CLANGSTATICANALYZERSETTINGS_H #define CLANGSTATICANALYZERSETTINGS_H -#include #include namespace ClangStaticAnalyzer { namespace Internal { -class ClangStaticAnalyzerSettings : public QObject +class ClangStaticAnalyzerSettings { - Q_OBJECT - public: static ClangStaticAnalyzerSettings *instance(); From f8dc9c44184a428133038d3a5cefff366d0bceb0 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 13 Apr 2015 17:57:53 +0200 Subject: [PATCH 2/3] Fix typo in unit tests Change-Id: I2e44d2174878211e5dfabc39c80488e5a1848943 Reviewed-by: Christian Kandeler --- plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp index d73cf78e42f..21b086858e3 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp @@ -96,7 +96,7 @@ void ClangStaticAnalyzerUnitTests::testProject_data() QTest::addColumn("expectedDiagCount"); QTest::newRow("qbs project") << QString(m_tmpDir->path() + QLatin1String("/simple/simple.qbs")) << 1; - QTest::newRow("qbs project") + QTest::newRow("qmake project") << QString(m_tmpDir->path() + QLatin1String("/simple/simple.pro")) << 1; } From 6cdf38077edeecf074c02f4c1a2fb93cc44a15a2 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 13 Apr 2015 16:22:18 +0200 Subject: [PATCH 3/3] Add missing test dependencies Adapting to commit 044eeacde5ee1add8b06a8a53b86fd5c6991d488 Load only tested plugins when invoked with -test in the qtcreator repository. Change-Id: If28c6c79fe412e35726567505080e3723092968d Reviewed-by: Christian Kandeler --- plugins/clangstaticanalyzer/clangstaticanalyzer.qbs | 5 +++++ .../clangstaticanalyzer/clangstaticanalyzer_dependencies.pri | 3 +++ 2 files changed, 8 insertions(+) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs b/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs index a97dc9f83c7..ffc3f134099 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs +++ b/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs @@ -15,6 +15,11 @@ QtcPlugin { Depends { name: "Qt.widgets" } Depends { name: "Qt.network" } // TODO: See above + pluginTestDepends: [ + "QbsProjectManager", + "QmakeProjectManager", + ] + files: [ "clangstaticanalyzerconfigwidget.cpp", "clangstaticanalyzerconfigwidget.h", diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri b/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri index 0ca1dbad9b1..f857a18e430 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri +++ b/plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri @@ -6,3 +6,6 @@ QTC_PLUGIN_DEPENDS += \ analyzerbase \ cpptools \ licensechecker +QTC_TEST_DEPENDS += \ + qbsprojectmanager \ + qmakeprojectmanager