diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-15 17:27:02 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-15 17:27:02 +0200 |
commit | 462f4054fe69f270d6a7ca61dda522e63e8b41e2 (patch) | |
tree | 91c3992a4064131d6962f1c0592800952331c04b | |
parent | 8b72a55054a1fa8aa3ae86c4cdd5a41384f640f4 (diff) | |
parent | 6cdf38077edeecf074c02f4c1a2fb93cc44a15a2 (diff) |
Merge remote-tracking branch 'origin/3.4'
4 files changed, 11 insertions, 6 deletions
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs b/plugins/clangstaticanalyzer/clangstaticanalyzer.qbs index b430b980da..4179000d76 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 0ca1dbad9b..f857a18e43 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 diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp index f61a82bd5a..cb6c45c00b 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp @@ -45,14 +45,14 @@ ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget( }; chooser->setAdditionalPathValidator(validator); 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<void (QSpinBox::*)(int)>(&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 71c4c21864..acd7545889 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h +++ b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h @@ -19,16 +19,13 @@ #ifndef CLANGSTATICANALYZERSETTINGS_H #define CLANGSTATICANALYZERSETTINGS_H -#include <QObject> #include <QString> namespace ClangStaticAnalyzer { namespace Internal { -class ClangStaticAnalyzerSettings : public QObject +class ClangStaticAnalyzerSettings { - Q_OBJECT - public: static ClangStaticAnalyzerSettings *instance(); |