util/kconfig: Uprev to Linux 6.6's kconfig
Upstream reimplemented KCONFIG_STRICT, just calling it KCONFIG_WERROR. Therefore, adapt our build system and documentation. Upstream is less strict at this time, but there's a proposed patch that got imported. TEST=`util/abuild/abuild -C` output (config.h and config.build) remains the same. Also, the failure type fixed in https://review.coreboot.org/c/coreboot/+/11272 can be detected, which I tested by manually breaking our Kconfig in a similar way. Change-Id: I322fb08a2f7308b93cff71a5dd4136f1a998773b Signed-off-by: Patrick Georgi <patrick@coreboot.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/79259 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin L Roth <gaumless@gmail.com> Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
This commit is contained in:
@@ -5,10 +5,10 @@
|
||||
*/
|
||||
|
||||
#include <QAction>
|
||||
#include <QActionGroup>
|
||||
#include <QApplication>
|
||||
#include <QCloseEvent>
|
||||
#include <QDebug>
|
||||
#include <QDesktopWidget>
|
||||
#include <QFileDialog>
|
||||
#include <QLabel>
|
||||
#include <QLayout>
|
||||
@@ -16,6 +16,8 @@
|
||||
#include <QMenu>
|
||||
#include <QMenuBar>
|
||||
#include <QMessageBox>
|
||||
#include <QRegularExpression>
|
||||
#include <QScreen>
|
||||
#include <QToolBar>
|
||||
|
||||
#include <stdlib.h>
|
||||
@@ -26,8 +28,6 @@
|
||||
#include "images.h"
|
||||
|
||||
|
||||
int kconfig_warnings = 0;
|
||||
|
||||
static QApplication *configApp;
|
||||
static ConfigSettings *configSettings;
|
||||
|
||||
@@ -1128,7 +1128,7 @@ QString ConfigInfoView::debug_info(struct symbol *sym)
|
||||
|
||||
QString ConfigInfoView::print_filter(const QString &str)
|
||||
{
|
||||
QRegExp re("[<>&\"\\n]");
|
||||
QRegularExpression re("[<>&\"\\n]");
|
||||
QString res = str;
|
||||
for (int i = 0; (i = res.indexOf(re, i)) >= 0;) {
|
||||
switch (res[i].toLatin1()) {
|
||||
@@ -1324,15 +1324,15 @@ ConfigMainWindow::ConfigMainWindow(void)
|
||||
int width, height;
|
||||
char title[256];
|
||||
|
||||
QDesktopWidget *d = configApp->desktop();
|
||||
snprintf(title, sizeof(title), "%s%s",
|
||||
rootmenu.prompt->text,
|
||||
""
|
||||
);
|
||||
setWindowTitle(title);
|
||||
|
||||
width = configSettings->value("/window width", d->width() - 64).toInt();
|
||||
height = configSettings->value("/window height", d->height() - 64).toInt();
|
||||
QRect g = configApp->primaryScreen()->geometry();
|
||||
width = configSettings->value("/window width", g.width() - 64).toInt();
|
||||
height = configSettings->value("/window height", g.height() - 64).toInt();
|
||||
resize(width, height);
|
||||
x = configSettings->value("/window x");
|
||||
y = configSettings->value("/window y");
|
||||
@@ -1381,17 +1381,17 @@ ConfigMainWindow::ConfigMainWindow(void)
|
||||
this, &ConfigMainWindow::goBack);
|
||||
|
||||
QAction *quitAction = new QAction("&Quit", this);
|
||||
quitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
|
||||
quitAction->setShortcut(Qt::CTRL | Qt::Key_Q);
|
||||
connect(quitAction, &QAction::triggered,
|
||||
this, &ConfigMainWindow::close);
|
||||
|
||||
QAction *loadAction = new QAction(QPixmap(xpm_load), "&Load", this);
|
||||
loadAction->setShortcut(Qt::CTRL + Qt::Key_L);
|
||||
loadAction->setShortcut(Qt::CTRL | Qt::Key_L);
|
||||
connect(loadAction, &QAction::triggered,
|
||||
this, &ConfigMainWindow::loadConfig);
|
||||
|
||||
saveAction = new QAction(QPixmap(xpm_save), "&Save", this);
|
||||
saveAction->setShortcut(Qt::CTRL + Qt::Key_S);
|
||||
saveAction->setShortcut(Qt::CTRL | Qt::Key_S);
|
||||
connect(saveAction, &QAction::triggered,
|
||||
this, &ConfigMainWindow::saveConfig);
|
||||
|
||||
@@ -1405,7 +1405,7 @@ ConfigMainWindow::ConfigMainWindow(void)
|
||||
connect(saveAsAction, &QAction::triggered,
|
||||
this, &ConfigMainWindow::saveConfigAs);
|
||||
QAction *searchAction = new QAction("&Find", this);
|
||||
searchAction->setShortcut(Qt::CTRL + Qt::Key_F);
|
||||
searchAction->setShortcut(Qt::CTRL | Qt::Key_F);
|
||||
connect(searchAction, &QAction::triggered,
|
||||
this, &ConfigMainWindow::searchConfig);
|
||||
singleViewAction = new QAction(QPixmap(xpm_single_view), "Single View", this);
|
||||
@@ -1752,11 +1752,21 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
|
||||
e->accept();
|
||||
return;
|
||||
}
|
||||
QMessageBox mb("qconf", "Save configuration?", QMessageBox::Warning,
|
||||
QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape);
|
||||
mb.setButtonText(QMessageBox::Yes, "&Save Changes");
|
||||
mb.setButtonText(QMessageBox::No, "&Discard Changes");
|
||||
mb.setButtonText(QMessageBox::Cancel, "Cancel Exit");
|
||||
|
||||
QMessageBox mb(QMessageBox::Icon::Warning, "qconf",
|
||||
"Save configuration?");
|
||||
|
||||
QPushButton *yb = mb.addButton(QMessageBox::Yes);
|
||||
QPushButton *db = mb.addButton(QMessageBox::No);
|
||||
QPushButton *cb = mb.addButton(QMessageBox::Cancel);
|
||||
|
||||
yb->setText("&Save Changes");
|
||||
db->setText("&Discard Changes");
|
||||
cb->setText("Cancel Exit");
|
||||
|
||||
mb.setDefaultButton(yb);
|
||||
mb.setEscapeButton(cb);
|
||||
|
||||
switch (mb.exec()) {
|
||||
case QMessageBox::Yes:
|
||||
if (saveConfig())
|
||||
|
Reference in New Issue
Block a user