diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-24 15:49:09 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-06-21 12:08:12 +0200 |
| commit | 24314562165588b56a318b3b8a846bf5deda7c41 (patch) | |
| tree | b5dcf951e76d003c2623011b0e91994e06e7e061 /src/plugins/autotoolsprojectmanager/autotoolsproject.h | |
| parent | 8c77b8c9d7b25d0c89003c8c4a54e8da5bfb7edd (diff) | |
| download | qt-creator-24314562165588b56a318b3b8a846bf5deda7c41.tar.gz | |
Profile introduction
Introduce Profiles to store sets of values that describe a system/device.
These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.
This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.
Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager/autotoolsproject.h')
| -rw-r--r-- | src/plugins/autotoolsprojectmanager/autotoolsproject.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index e253ecc5fa..55612306bb 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -35,10 +35,7 @@ #ifndef AUTOTOOLSPROJECT_H #define AUTOTOOLSPROJECT_H -#include "autotoolstarget.h" - #include <coreplugin/editormanager/ieditor.h> -#include <projectexplorer/toolchain.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectnodes.h> @@ -47,10 +44,6 @@ #include <QPointer> #include <QDir> -namespace ProjectExplorer { -class ToolChain; -} - namespace AutotoolsProjectManager { namespace Internal { class AutotoolsConfigurationFactory; @@ -80,18 +73,11 @@ public: Core::Id id() const; Core::IDocument *document() const; ProjectExplorer::IProjectManager *projectManager() const; - AutotoolsTarget *activeTarget() const; QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets(); ProjectExplorer::ProjectNode *rootProjectNode() const; QStringList files(FilesMode fileMode) const; QString defaultBuildDirectory() const; QStringList buildTargets() const; - ProjectExplorer::ToolChain *toolChain() const; - void setToolChain(ProjectExplorer::ToolChain *tc); - QVariantMap toMap() const; - -signals: - void toolChainChanged(ProjectExplorer::ToolChain *tc); protected: bool fromMap(const QVariantMap &map); @@ -100,7 +86,7 @@ private slots: /** * Loads the project tree by parsing the makefiles. */ - void loadProjectTree(); + void evaluateBuildSystem(); /** * Is invoked when the makefile parsing by m_makefileParserThread has @@ -171,8 +157,6 @@ private: /// Responsible for parsing the makefiles asynchronously in a thread MakefileParserThread *m_makefileParserThread; - - ProjectExplorer::ToolChain *m_toolChain; }; } // namespace Internal |