diff options
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index f76881dcaa..5b72f4237d 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -65,7 +65,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(ProjectExplorer::Target *parent CMakeBuildConfiguration *source) : BuildConfiguration(parent, source), m_msvcVersion(source->m_msvcVersion), - m_useNinja(false) + m_useNinja(source->m_useNinja) { Q_ASSERT(parent); cloneSteps(source); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs index 18ccd17481..aaa7e9c65b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import QtcPlugin diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 405b598990..ec7abf0d90 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -37,7 +37,7 @@ CMakeProjectNode::CMakeProjectNode(const QString &fileName) { } -bool CMakeProjectNode::hasBuildTargets() const +bool CMakeProjectNode::showInSimpleTree() const { // TODO return true; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h index d34989ef22..f2bfe1c869 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h @@ -41,7 +41,7 @@ class CMakeProjectNode : public ProjectExplorer::ProjectNode friend class CMakeProject; public: CMakeProjectNode(const QString &fileName); - virtual bool hasBuildTargets() const; + virtual bool showInSimpleTree() const; virtual QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; virtual bool canAddSubProject(const QString &proFilePath) const; diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index e8b4fee8a6..5c9df61af8 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -260,7 +260,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory")); QToolButton *resetButton = new QToolButton(); - resetButton->setToolTip(tr("Reset to default")); + resetButton->setToolTip(tr("Reset to default.")); resetButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_RESET))); QHBoxLayout *boxlayout = new QHBoxLayout(); |