aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/kconfig/qconf.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index cf2e06ebc4a8..79275c44d7be 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1382,7 +1382,6 @@ void ConfigSearchWindow::search(void)
ConfigMainWindow::ConfigMainWindow(void)
: searchWindow(0)
{
- QMenuBar* menu;
bool ok = true;
QVariant x, y;
int width, height;
@@ -1433,7 +1432,6 @@ ConfigMainWindow::ConfigMainWindow(void)
setTabOrder(configList, helpText);
configList->setFocus();
- menu = menuBar();
toolBar = new QToolBar("Tools", this);
addToolBar(toolBar);
@@ -1519,7 +1517,7 @@ ConfigMainWindow::ConfigMainWindow(void)
toolBar->addAction(fullViewAction);
// create config menu
- QMenu* config = menu->addMenu("&File");
+ QMenu* config = menuBar()->addMenu("&File");
config->addAction(loadAction);
config->addAction(saveAction);
config->addAction(saveAsAction);
@@ -1527,12 +1525,13 @@ ConfigMainWindow::ConfigMainWindow(void)
config->addAction(quitAction);
// create edit menu
- QMenu* editMenu = menu->addMenu("&Edit");
+ QMenu* editMenu = menuBar()->addMenu("&Edit");
editMenu->addAction(searchAction);
// create options menu
- QMenu* optionMenu = menu->addMenu("&Option");
+ QMenu* optionMenu = menuBar()->addMenu("&Option");
optionMenu->addAction(showNameAction);
+
optionMenu->addAction(showRangeAction);
optionMenu->addAction(showDataAction);
optionMenu->addSeparator();
@@ -1541,7 +1540,7 @@ ConfigMainWindow::ConfigMainWindow(void)
optionMenu->addAction(showDebugAction);
// create help menu
- QMenu* helpMenu = menu->addMenu("&Help");
+ QMenu* helpMenu = menuBar()->addMenu("&Help");
helpMenu->addAction(showIntroAction);
helpMenu->addAction(showAboutAction);