diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-01-13 12:48:28 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-01-15 20:48:04 +0100 |
| commit | 21f540be4e247b4468d0e8adbf9e3a7575f8a085 (patch) | |
| tree | 8c572a31fbc5cbeecb015a3b15ce00debf03a074 /support/kconfig/qconf.cc | |
| parent | 8f8d414b61bf3b27a77ad38dfc493ae412b65471 (diff) | |
| download | buildroot-novena-21f540be4e247b4468d0e8adbf9e3a7575f8a085.tar.gz buildroot-novena-21f540be4e247b4468d0e8adbf9e3a7575f8a085.zip | |
kconfig: sync with linux-3.0
And drop unused make-write-deps patch.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'support/kconfig/qconf.cc')
| -rw-r--r-- | support/kconfig/qconf.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/support/kconfig/qconf.cc b/support/kconfig/qconf.cc index 06dd2e335..c2796b866 100644 --- a/support/kconfig/qconf.cc +++ b/support/kconfig/qconf.cc @@ -1489,8 +1489,7 @@ void ConfigMainWindow::saveConfigAs(void) QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this); if (s.isNull()) return; - if (conf_write(QFile::encodeName(s))) - QMessageBox::information(this, "qconf", _("Unable to save configuration!")); + saveConfig(); } void ConfigMainWindow::searchConfig(void) @@ -1643,7 +1642,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit")); switch (mb.exec()) { case QMessageBox::Yes: - conf_write(NULL); + saveConfig(); case QMessageBox::No: e->accept(); break; |