tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kconfig: qconf: fix the content of the main widget

The port to Qt5 tried to preserve the same way as it used
to work with Qt3 and Qt4. However, at least with newer
versions of Qt5 (5.13), this doesn't work properly.

Change the schema by adding a vertical layout, in order
for it to start working properly again.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

authored by

Mauro Carvalho Chehab and committed by
Masahiro Yamada cce1faba 5752ff07

+18 -7
+18 -7
scripts/kconfig/qconf.cc
··· 1360 1360 if ((x.isValid())&&(y.isValid())) 1361 1361 move(x.toInt(), y.toInt()); 1362 1362 1363 - split1 = new QSplitter(this); 1364 - split1->setOrientation(Qt::Horizontal); 1365 - setCentralWidget(split1); 1363 + QWidget *widget = new QWidget(this); 1364 + QVBoxLayout *layout = new QVBoxLayout(widget); 1365 + setCentralWidget(widget); 1366 1366 1367 - menuView = new ConfigView(split1, "menu"); 1367 + split1 = new QSplitter(widget); 1368 + split1->setOrientation(Qt::Horizontal); 1369 + split1->setChildrenCollapsible(false); 1370 + 1371 + menuView = new ConfigView(widget, "menu"); 1368 1372 menuList = menuView->list; 1369 1373 1370 - split2 = new QSplitter(split1); 1374 + split2 = new QSplitter(widget); 1375 + split2->setChildrenCollapsible(false); 1371 1376 split2->setOrientation(Qt::Vertical); 1372 1377 1373 1378 // create config tree 1374 - configView = new ConfigView(split2, "config"); 1379 + configView = new ConfigView(widget, "config"); 1375 1380 configList = configView->list; 1376 1381 1377 - helpText = new ConfigInfoView(split2, "help"); 1382 + helpText = new ConfigInfoView(widget, "help"); 1383 + 1384 + layout->addWidget(split2); 1385 + split2->addWidget(split1); 1386 + split1->addWidget(configView); 1387 + split1->addWidget(menuView); 1388 + split2->addWidget(helpText); 1378 1389 1379 1390 setTabOrder(configList, helpText); 1380 1391 configList->setFocus();