feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4'

Browse Source
This commit is contained in:
Eike Ziller
2015-04-15 17:27:02 +02:00
parent 8b72a55054 6cdf38077e
commit 462f4054fe
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/clangstaticanalyzer/clangstaticanalyzer.qbs
View File

@@ -15,6 +15,11 @@ QtcPlugin {
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Qt.network" } // TODO: See above Depends { name: "Qt.network" } // TODO: See above
pluginTestDepends: [
"QbsProjectManager",
"QmakeProjectManager",
]
files: [ files: [
"clangstaticanalyzerconfigwidget.cpp", "clangstaticanalyzerconfigwidget.cpp",
"clangstaticanalyzerconfigwidget.h", "clangstaticanalyzerconfigwidget.h",

3
plugins/clangstaticanalyzer/clangstaticanalyzer_dependencies.pri
View File

@@ -6,3 +6,6 @@ QTC_PLUGIN_DEPENDS += \
analyzerbase \ analyzerbase \
cpptools \ cpptools \
licensechecker licensechecker
QTC_TEST_DEPENDS += \
qbsprojectmanager \
qmakeprojectmanager

4
plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp
View File

@@ -45,14 +45,14 @@ ClangStaticAnalyzerConfigWidget::ClangStaticAnalyzerConfigWidget(
}; };
chooser->setAdditionalPathValidator(validator); chooser->setAdditionalPathValidator(validator);
connect(m_ui->clangExecutableChooser, &Utils::PathChooser::changed, 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->setValue(settings->simultaneousProcesses());
m_ui->simultaneousProccessesSpinBox->setMinimum(1); m_ui->simultaneousProccessesSpinBox->setMinimum(1);
m_ui->simultaneousProccessesSpinBox->setMaximum(QThread::idealThreadCount()); m_ui->simultaneousProccessesSpinBox->setMaximum(QThread::idealThreadCount());
connect(m_ui->simultaneousProccessesSpinBox, connect(m_ui->simultaneousProccessesSpinBox,
static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
m_settings, &ClangStaticAnalyzerSettings::setSimultaneousProcesses); [settings](int count) { settings->setSimultaneousProcesses(count); });
} }
ClangStaticAnalyzerConfigWidget::~ClangStaticAnalyzerConfigWidget() ClangStaticAnalyzerConfigWidget::~ClangStaticAnalyzerConfigWidget()

5
plugins/clangstaticanalyzer/clangstaticanalyzersettings.h
View File

@@ -19,16 +19,13 @@
#ifndef CLANGSTATICANALYZERSETTINGS_H #ifndef CLANGSTATICANALYZERSETTINGS_H
#define CLANGSTATICANALYZERSETTINGS_H #define CLANGSTATICANALYZERSETTINGS_H
#include <QObject>
#include <QString> #include <QString>
namespace ClangStaticAnalyzer { namespace ClangStaticAnalyzer {
namespace Internal { namespace Internal {
class ClangStaticAnalyzerSettings : public QObject class ClangStaticAnalyzerSettings
{ {
Q_OBJECT
public: public:
static ClangStaticAnalyzerSettings *instance(); static ClangStaticAnalyzerSettings *instance();