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/qtsupport/baseqtversion.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/qtsupport/baseqtversion.h')
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 049b842c8e..1606fd8963 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -51,6 +51,8 @@ class Environment; namespace ProjectExplorer { class IOutputParser; +class Profile; +class ToolChain; } // namespace ProjectExplorer QT_BEGIN_NAMESPACE @@ -121,19 +123,17 @@ public: virtual QString invalidReason() const; virtual QString warningReason() const; - virtual bool toolChainAvailable(const Core::Id id) const; + virtual ProjectExplorer::ToolChain *preferredToolChain(const Utils::FileName &ms) const; virtual QString description() const = 0; virtual QString toHtml(bool verbose) const; - virtual bool supportsTargetId(const Core::Id id) const = 0; - virtual QSet<Core::Id> supportedTargetIds() const = 0; QList<ProjectExplorer::Abi> qtAbis() const; virtual QList<ProjectExplorer::Abi> detectQtAbis() const = 0; // Returns the PREFIX, BINPREFIX, DOCPREFIX and similar information virtual QHash<QString,QString> versionInfo() const; - virtual void addToEnvironment(Utils::Environment &env) const; + virtual void addToEnvironment(const ProjectExplorer::Profile *p, Utils::Environment &env) const; virtual Utils::FileName sourcePath() const; // used by QtUiCodeModelSupport @@ -154,12 +154,11 @@ public: bool hasDemos() const; QString demosPath() const; - virtual QList<ProjectExplorer::HeaderPath> systemHeaderPathes() const; + virtual QList<ProjectExplorer::HeaderPath> systemHeaderPathes(const ProjectExplorer::Profile *p) const; virtual QString frameworkInstallPath() const; // former local functions Utils::FileName qmakeCommand() const; - virtual QString systemRoot() const; /// @returns the name of the mkspec Utils::FileName mkspec() const; @@ -185,7 +184,7 @@ public: /// Check a .pro-file/Qt version combination on possible issues /// @return a list of tasks, ordered on severity (errors first, then /// warnings and finally info items. - QList<ProjectExplorer::Task> reportIssues(const QString &proFile, const QString &buildDir); + QList<ProjectExplorer::Task> reportIssues(const QString &proFile, const QString &buildDir) const; virtual ProjectExplorer::IOutputParser *createOutputParser() const; @@ -221,11 +220,13 @@ public: virtual QString platformDisplayName() const; virtual bool supportsPlatform(const QString &platformName) const; + virtual QList<ProjectExplorer::Task> validateProfile(const ProjectExplorer::Profile *p); + protected: BaseQtVersion(); BaseQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString()); - virtual QList<ProjectExplorer::Task> reportIssuesImpl(const QString &proFile, const QString &buildDir); + virtual QList<ProjectExplorer::Task> reportIssuesImpl(const QString &proFile, const QString &buildDir) const; // helper function for desktop and simulator to figure out the supported abis based on the libraries static Utils::FileName qtCorePath(const QHash<QString,QString> &versionInfo, const QString &versionString); |