diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-03-04 15:07:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-04 15:07:19 +0100 |
| commit | 7545ce072f64cd6b16f7663b0643fb0024bdeff1 (patch) | |
| tree | 75cde8a692c4b7d3d77ed974958542121117b57b /src/plugins/projectexplorer/kit.h | |
| parent | 04f2533c36de2592ac149b2868b40933750b351d (diff) | |
| parent | fde3803ca8f08b1ad737256cef934fca525df3fa (diff) | |
| download | qt-creator-7545ce072f64cd6b16f7663b0643fb0024bdeff1.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
Diffstat (limited to 'src/plugins/projectexplorer/kit.h')
| -rw-r--r-- | src/plugins/projectexplorer/kit.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h index bd79ff3e83..3bebca6fe6 100644 --- a/src/plugins/projectexplorer/kit.h +++ b/src/plugins/projectexplorer/kit.h @@ -66,7 +66,8 @@ public: bool isValid() const; bool hasWarning() const; QList<Task> validate() const; - void fix(); // Fix the individual kit information. + void fix(); // Fix the individual kit information: Make sure it contains a valid value. + // Fix will not look at other information in the kit! void setup(); // Apply advanced magic(TM). Used only once on each kit during initial setup. QString displayName() const; |