diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
commit | 868428cc634f0e2c6d5ace84555675cb80363d3f (patch) | |
tree | 98d321520f31107067ca45e5b5806d92551b2f3d /src/plugins/autotoolsprojectmanager | |
parent | 0d303db8c2e79c772cd216bfc07b42637c37e1bd (diff) | |
parent | 93184f7959bd18ba6f77e8d8b312f0e3be95d70c (diff) | |
download | qt-creator-868428cc634f0e2c6d5ace84555675cb80363d3f.tar.gz |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qbs/imports/QtcTool.qbs
src/plugins/git/giteditor.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs index cb64585b63..0d377593c4 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import QtcPlugin diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp index 355720d169..f7bee79cbd 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp @@ -45,7 +45,7 @@ AutotoolsProjectNode::AutotoolsProjectNode(AutotoolsProject *project, Core::IDoc { } -bool AutotoolsProjectNode::hasBuildTargets() const +bool AutotoolsProjectNode::showInSimpleTree() const { return true; } diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h index a96e1485a2..8c96d0977a 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h @@ -57,7 +57,7 @@ class AutotoolsProjectNode : public ProjectExplorer::ProjectNode public: AutotoolsProjectNode(AutotoolsProject *project, Core::IDocument *projectFile); - bool hasBuildTargets() const; + bool showInSimpleTree() const; QList<ProjectExplorer::ProjectAction> supportedActions(Node *node) const; bool canAddSubProject(const QString &proFilePath) const; bool addSubProjects(const QStringList &proFilePaths); |