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,68 @@
// 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
#pragma once
#include "mesontoolkitaspect.h"
#include "mesonwrapper.h"
#include "ninjatoolkitaspect.h"
#include <projectexplorer/kitmanager.h>
#include <utils/layoutbuilder.h>
#include <QComboBox>
#include <QCoreApplication>
namespace MesonProjectManager {
namespace Internal {
class ToolKitAspectWidget final : public ProjectExplorer::KitAspectWidget
{
Q_DECLARE_TR_FUNCTIONS(MesonProjectManager::Internal::ToolKitAspect)
public:
enum class ToolType { Meson, Ninja };
ToolKitAspectWidget(ProjectExplorer::Kit *kit,
const ProjectExplorer::KitAspect *ki,
ToolType type);
~ToolKitAspectWidget();
private:
void addTool(const MesonTools::Tool_t &tool);
void removeTool(const MesonTools::Tool_t &tool);
void setCurrentToolIndex(int index);
int indexOf(const Utils::Id &id);
bool isCompatible(const MesonTools::Tool_t &tool);
void loadTools();
void setToDefault();
void makeReadOnly() override { m_toolsComboBox->setEnabled(false); }
void addToLayout(Utils::LayoutBuilder &builder) override
{
addMutableAction(m_toolsComboBox);
builder.addItem(m_toolsComboBox);
builder.addItem(m_manageButton);
}
void refresh() override
{
const auto id = [this]() {
if (m_type == ToolType::Meson)
return MesonToolKitAspect::mesonToolId(m_kit);
return NinjaToolKitAspect::ninjaToolId(m_kit);
}();
if (id.isValid())
m_toolsComboBox->setCurrentIndex(indexOf(id));
else {
setToDefault();
}
}
QComboBox *m_toolsComboBox;
QWidget *m_manageButton;
ToolType m_type;
};
} // namespace Internal
} // namespace MesonProjectManager