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,59 @@
// 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 "toolitemsettings.h"
#include "tooltreeitem.h"
#include <utils/layoutbuilder.h>
#include <utils/pathchooser.h>
#include <QLineEdit>
using namespace Utils;
namespace MesonProjectManager::Internal {
ToolItemSettings::ToolItemSettings(QWidget *parent)
: QWidget(parent)
{
m_mesonNameLineEdit = new QLineEdit;
m_mesonPathChooser = new PathChooser;
m_mesonPathChooser->setExpectedKind(PathChooser::ExistingCommand);
m_mesonPathChooser->setHistoryCompleter(QLatin1String("Meson.Command.History"));
using namespace Layouting;
Form {
tr("Name:"), m_mesonNameLineEdit, br,
tr("Path:"), m_mesonPathChooser, br,
}.attachTo(this, WithoutMargins);
connect(m_mesonPathChooser, &PathChooser::rawPathChanged, this, &ToolItemSettings::store);
connect(m_mesonNameLineEdit, &QLineEdit::textChanged, this, &ToolItemSettings::store);
}
void ToolItemSettings::load(ToolTreeItem *item)
{
if (item) {
m_currentId = std::nullopt;
m_mesonNameLineEdit->setDisabled(item->isAutoDetected());
m_mesonNameLineEdit->setText(item->name());
m_mesonPathChooser->setDisabled(item->isAutoDetected());
m_mesonPathChooser->setFilePath(item->executable());
m_currentId = item->id();
} else {
m_currentId = std::nullopt;
}
}
void ToolItemSettings::store()
{
if (m_currentId)
emit applyChanges(*m_currentId,
m_mesonNameLineEdit->text(),
m_mesonPathChooser->filePath());
}
} // MesonProjectManager::Internal