Meson: Flatten directory hierarchy

Keep tests/ and icons/ but put the rest into the toplevel.

The previous setup was so different from the rest of the bunch that
it regularly stuck out in maintenance tasks.

Change-Id: I69821be6268f69682353a388f6bb1fa343215303
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2022-10-06 16:58:18 +02:00
parent 7c0c57fef9
commit 5e786d444d
81 changed files with 260 additions and 261 deletions

View File

@@ -0,0 +1,77 @@
// Copyright (C) 2020 Alexis Jeandet.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "ninjatoolkitaspect.h"
#include "toolkitaspectwidget.h"
#include <utils/qtcassert.h>
namespace MesonProjectManager {
namespace Internal {
static const char TOOL_ID[] = "MesonProjectManager.MesonKitInformation.Ninja";
NinjaToolKitAspect::NinjaToolKitAspect()
{
setObjectName(QLatin1String("NinjaKitAspect"));
setId(TOOL_ID);
setDisplayName(tr("Ninja Tool"));
setDescription(tr("The Ninja tool to use when building a project with Meson.<br>"
"This setting is ignored when using other build systems."));
setPriority(9000);
}
ProjectExplorer::Tasks NinjaToolKitAspect::validate(const ProjectExplorer::Kit *k) const
{
ProjectExplorer::Tasks tasks;
const auto tool = ninjaTool(k);
if (tool && !tool->isValid())
tasks << ProjectExplorer::BuildSystemTask{ProjectExplorer::Task::Warning,
tr("Cannot validate this Ninja executable.")};
return tasks;
}
void NinjaToolKitAspect::setup(ProjectExplorer::Kit *k)
{
const auto tool = ninjaTool(k);
if (!tool) {
const auto autoDetected = MesonTools::ninjaWrapper();
if (autoDetected)
setNinjaTool(k, autoDetected->id());
}
}
void NinjaToolKitAspect::fix(ProjectExplorer::Kit *k)
{
setup(k);
}
ProjectExplorer::KitAspect::ItemList NinjaToolKitAspect::toUserOutput(
const ProjectExplorer::Kit *k) const
{
const auto tool = ninjaTool(k);
if (tool)
return {{tr("Ninja"), tool->name()}};
return {{tr("Ninja"), tr("Unconfigured")}};
}
ProjectExplorer::KitAspectWidget *NinjaToolKitAspect::createConfigWidget(ProjectExplorer::Kit *k) const
{
QTC_ASSERT(k, return nullptr);
return new ToolKitAspectWidget{k, this, ToolKitAspectWidget::ToolType::Ninja};
}
void NinjaToolKitAspect::setNinjaTool(ProjectExplorer::Kit *kit, Utils::Id id)
{
QTC_ASSERT(kit && id.isValid(), return );
kit->setValue(TOOL_ID, id.toSetting());
}
Utils::Id NinjaToolKitAspect::ninjaToolId(const ProjectExplorer::Kit *kit)
{
QTC_ASSERT(kit, return {});
return Utils::Id::fromSetting(kit->value(TOOL_ID));
}
} // namespace Internal
} // namespace MesonProjectManager