projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: qconf: overload addToolBar() to create and insert toolbar
[linux-2.6-microblaze.git]
/
scripts
/
kconfig
/
qconf.cc
diff --git
a/scripts/kconfig/qconf.cc
b/scripts/kconfig/qconf.cc
index
f2f5875
..
b440589
100644
(file)
--- a/
scripts/kconfig/qconf.cc
+++ b/
scripts/kconfig/qconf.cc
@@
-1432,9
+1432,6
@@
ConfigMainWindow::ConfigMainWindow(void)
setTabOrder(configList, helpText);
configList->setFocus();
setTabOrder(configList, helpText);
configList->setFocus();
- QToolBar *toolBar = new QToolBar("Tools", this);
- addToolBar(toolBar);
-
backAction = new QAction(QPixmap(xpm_back), "Back", this);
connect(backAction, SIGNAL(triggered(bool)), SLOT(goBack()));
backAction = new QAction(QPixmap(xpm_back), "Back", this);
connect(backAction, SIGNAL(triggered(bool)), SLOT(goBack()));
@@
-1507,6
+1504,7
@@
ConfigMainWindow::ConfigMainWindow(void)
connect(showAboutAction, SIGNAL(triggered(bool)), SLOT(showAbout()));
// init tool bar
connect(showAboutAction, SIGNAL(triggered(bool)), SLOT(showAbout()));
// init tool bar
+ QToolBar *toolBar = addToolBar("Tools");
toolBar->addAction(backAction);
toolBar->addSeparator();
toolBar->addAction(loadAction);
toolBar->addAction(backAction);
toolBar->addSeparator();
toolBar->addAction(loadAction);