summaryrefslogtreecommitdiff
path: root/src/plugins/genericprojectmanager/genericproject.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2012-04-24 15:49:09 +0200
committerTobias Hunger <tobias.hunger@nokia.com>2012-06-21 12:08:12 +0200
commit24314562165588b56a318b3b8a846bf5deda7c41 (patch)
treeb5dcf951e76d003c2623011b0e91994e06e7e061 /src/plugins/genericprojectmanager/genericproject.h
parent8c77b8c9d7b25d0c89003c8c4a54e8da5bfb7edd (diff)
downloadqt-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/genericprojectmanager/genericproject.h')
-rw-r--r--src/plugins/genericprojectmanager/genericproject.h47
1 files changed, 3 insertions, 44 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index a36f2323c4..17c5791677 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -35,13 +35,11 @@
#include "genericprojectmanager.h"
#include "genericprojectnodes.h"
-#include "generictarget.h"
#include <projectexplorer/project.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
-#include <projectexplorer/buildstep.h>
#include <projectexplorer/buildconfiguration.h>
#include <coreplugin/idocument.h>
@@ -51,13 +49,7 @@ QT_BEGIN_NAMESPACE
class QComboBox;
QT_END_NAMESPACE
-namespace Utils {
-class PathChooser;
-}
-
-namespace ProjectExplorer {
-class ToolChain;
-}
+namespace ProjectExplorer { class ToolChain; }
namespace GenericProjectManager {
namespace Internal {
@@ -84,7 +76,6 @@ public:
Core::Id id() const;
Core::IDocument *document() const;
ProjectExplorer::IProjectManager *projectManager() const;
- GenericTarget *activeTarget() const;
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
@@ -114,18 +105,12 @@ public:
QStringList projectIncludePaths() const;
QStringList files() const;
QStringList generated() const;
- ProjectExplorer::ToolChain *toolChain() const;
- void setToolChain(ProjectExplorer::ToolChain *tc);
-
- QVariantMap toMap() const;
-
-signals:
- void toolChainChanged(ProjectExplorer::ToolChain *);
protected:
- virtual bool fromMap(const QVariantMap &map);
+ bool fromMap(const QVariantMap &map);
private:
+ void evaluateBuildSystem();
bool saveRawFileList(const QStringList &rawFileList);
void parseProject(RefreshOptions options);
QStringList processEntries(const QStringList &paths,
@@ -150,7 +135,6 @@ private:
QByteArray m_defines;
GenericProjectNode *m_rootNode;
- ProjectExplorer::ToolChain *m_toolChain;
QFuture<void> m_codeModelFuture;
};
@@ -182,31 +166,6 @@ private:
GenericProject::RefreshOptions m_options;
};
-class GenericBuildSettingsWidget : public ProjectExplorer::BuildConfigWidget
-{
- Q_OBJECT
-
-public:
- GenericBuildSettingsWidget(GenericTarget *target);
- virtual ~GenericBuildSettingsWidget();
-
- virtual QString displayName() const;
-
- virtual void init(ProjectExplorer::BuildConfiguration *bc);
-
-private Q_SLOTS:
- void buildDirectoryChanged();
- void toolChainSelected(int index);
- void toolChainChanged(ProjectExplorer::ToolChain *);
- void updateToolChainList();
-
-private:
- GenericTarget *m_target;
- Utils::PathChooser *m_pathChooser;
- QComboBox *m_toolChainChooser;
- GenericBuildConfiguration *m_buildConfiguration;
-};
-
} // namespace Internal
} // namespace GenericProjectManager