diff options
author | Markus Heidelberg <markus.heidelberg@web.de> | 2009-05-17 19:36:53 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2009-06-09 16:37:51 -0400 |
commit | 284026cdfb5a899e558dcb7a36aefaf54a78c094 (patch) | |
tree | 6a03143cbf7727132494cb68a1420940dc5b7d98 /scripts/kconfig/qconf.cc | |
parent | 8d90c97e46930d01e9394bceb6276c7175136bdc (diff) |
kconfig: do not hardcode ".config" filename
Rather than hardcoding ".config" use conf_get_configname(), which also
respects the environment variable KCONFIG_CONFIG.
This fixes "make silentoldconfig" when KCONFIG_CONFIG is used and also
suggests the given filename for "Load" and "Save as" in qconf.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/kconfig/qconf.cc')
-rw-r--r-- | scripts/kconfig/qconf.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 19811fcca6d6..ce7d508c7520 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -1448,7 +1448,7 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1448 | 1448 | ||
1449 | void ConfigMainWindow::loadConfig(void) | 1449 | void ConfigMainWindow::loadConfig(void) |
1450 | { | 1450 | { |
1451 | QString s = QFileDialog::getOpenFileName(".config", NULL, this); | 1451 | QString s = QFileDialog::getOpenFileName(conf_get_configname(), NULL, this); |
1452 | if (s.isNull()) | 1452 | if (s.isNull()) |
1453 | return; | 1453 | return; |
1454 | if (conf_read(QFile::encodeName(s))) | 1454 | if (conf_read(QFile::encodeName(s))) |
@@ -1464,7 +1464,7 @@ void ConfigMainWindow::saveConfig(void) | |||
1464 | 1464 | ||
1465 | void ConfigMainWindow::saveConfigAs(void) | 1465 | void ConfigMainWindow::saveConfigAs(void) |
1466 | { | 1466 | { |
1467 | QString s = QFileDialog::getSaveFileName(".config", NULL, this); | 1467 | QString s = QFileDialog::getSaveFileName(conf_get_configname(), NULL, this); |
1468 | if (s.isNull()) | 1468 | if (s.isNull()) |
1469 | return; | 1469 | return; |
1470 | if (conf_write(QFile::encodeName(s))) | 1470 | if (conf_write(QFile::encodeName(s))) |