forked from qt-creator/qt-creator
Docker: Rework auto-detection and removal of kit items
- Use more uniform messages for the different kinds of items - Remove all auto-detected items Change-Id: I0b0df0bca484337039432b163bd8e19593b1cd22 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -277,9 +277,10 @@ void CMakeKitAspect::setup(Kit *k)
|
||||
return;
|
||||
|
||||
// Look for a suitable auto-detected one:
|
||||
const QString id = k->autoDetectionSource();
|
||||
const QString kitSource = k->autoDetectionSource();
|
||||
for (CMakeTool *tool : CMakeToolManager::cmakeTools()) {
|
||||
if (tool->detectionSource() == id) {
|
||||
const QString toolSource = tool->detectionSource();
|
||||
if (!toolSource.isEmpty() && toolSource == kitSource) {
|
||||
setCMakeTool(k, tool->id());
|
||||
return;
|
||||
}
|
||||
@@ -1043,8 +1044,6 @@ CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k)
|
||||
|
||||
QVariant CMakeConfigurationKitAspect::defaultValue(const Kit *k) const
|
||||
{
|
||||
Q_UNUSED(k)
|
||||
|
||||
// FIXME: Convert preload scripts
|
||||
CMakeConfig config = defaultConfiguration(k);
|
||||
const QStringList tmp
|
||||
|
||||
Reference in New Issue
Block a user