diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-28 12:02:40 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-28 12:02:40 +0100 |
| commit | 6bbdeec8127cc968245eab34c2cd1ac42e053bde (patch) | |
| tree | 141e9a34e8fdce4116c32a6bfb0a2b3b7510ee75 /src/plugins/projectexplorer/kit.h | |
| parent | e84647aef4f49f35daf44c393499f1b5f0f5dba0 (diff) | |
| parent | fac11973af407802edd8c44264b6e641d2aa21cf (diff) | |
| download | qt-creator-6bbdeec8127cc968245eab34c2cd1ac42e053bde.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/qnx/blackberrydeployconfiguration.cpp
Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
Diffstat (limited to 'src/plugins/projectexplorer/kit.h')
| -rw-r--r-- | src/plugins/projectexplorer/kit.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h index 7340844ee8..bd79ff3e83 100644 --- a/src/plugins/projectexplorer/kit.h +++ b/src/plugins/projectexplorer/kit.h @@ -75,6 +75,7 @@ public: QString fileSystemFriendlyName() const; bool isAutoDetected() const; + bool isSdkProvided() const; Core::Id id() const; QIcon icon() const; @@ -96,14 +97,15 @@ public: Kit *clone(bool keepName = false) const; void copyFrom(const Kit *k); + void setAutoDetected(bool detected); private: + void setSdkProvided(bool sdkProvided); ~Kit(); // Unimplemented. Kit(const Kit &other); void operator=(const Kit &other); - void setAutoDetected(bool detected); void kitUpdated(); |