feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
This commit is contained in:
Eike Ziller
2015-02-12 17:36:29 +01:00
parent 9926fc2ab1 28971701fd
commit 56aadc407d
44 changed files with 302 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/kit.cpp
View File

@@ -582,16 +582,19 @@ QString Kit::toHtml(const QList<Task> &additional) const
void Kit::setAutoDetected(bool detected)
{
d->m_autodetected = detected;
kitUpdated();
}
void Kit::setAutoDetectionSource(const QString &autoDetectionSource)
{
d->m_autoDetectionSource = autoDetectionSource;
kitUpdated();
}
void Kit::setSdkProvided(bool sdkProvided)
{
d->m_sdkProvided = sdkProvided;
kitUpdated();
}
void Kit::makeSticky()
@@ -608,11 +611,13 @@ void Kit::setSticky(Id id, bool b)
d->m_sticky.insert(id);
else
d->m_sticky.remove(id);
kitUpdated();
}
void Kit::makeUnSticky()
{
d->m_sticky.clear();
kitUpdated();
}
void Kit::setMutable(Id id, bool b)
@@ -621,6 +626,7 @@ void Kit::setMutable(Id id, bool b)
d->m_mutable.insert(id);
else
d->m_mutable.remove(id);
kitUpdated();
}
bool Kit::isMutable(Id id) const