diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-12 17:36:29 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-12 17:36:29 +0100 |
| commit | 56aadc407d7becadec794e660ae7d7c20e820e0c (patch) | |
| tree | c9aad23933bc6b0c68406e64e359f57143ef54d8 /src/plugins/projectexplorer/kitmodel.h | |
| parent | 9926fc2ab12ccaa02b7f03b416c54cd58ef30b31 (diff) | |
| parent | 28971701fd4baa99f294d9393650b83c40754e18 (diff) | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/debugger/watchhandler.cpp
src/plugins/projectexplorer/kitmodel.cpp
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
src/shared/qbs
Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
Diffstat (limited to 'src/plugins/projectexplorer/kitmodel.h')
| -rw-r--r-- | src/plugins/projectexplorer/kitmodel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/kitmodel.h b/src/plugins/projectexplorer/kitmodel.h index d3b7054fbb..56628b7fb6 100644 --- a/src/plugins/projectexplorer/kitmodel.h +++ b/src/plugins/projectexplorer/kitmodel.h @@ -84,6 +84,7 @@ private: void removeKit(ProjectExplorer::Kit *k); void changeDefaultKit(); void validateKitNames(); + void isAutoDetectedChanged(); KitNode *findWorkingCopy(Kit *k) const; KitNode *createNode(Kit *k); |