diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2013-10-06 19:21:31 +0100 |
---|---|---|
committer | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-10-08 23:52:16 +0200 |
commit | 00d4f8fc2c729b1baf723cacd2b5942b032b6784 (patch) | |
tree | dae8c6a4797d1d10228907264f3034f9c75e4fb6 | |
parent | 503c823048e81cc85c0e9d8c297cc70203e335e5 (diff) | |
download | linux-stable-00d4f8fc2c729b1baf723cacd2b5942b032b6784.tar.gz linux-stable-00d4f8fc2c729b1baf723cacd2b5942b032b6784.tar.bz2 linux-stable-00d4f8fc2c729b1baf723cacd2b5942b032b6784.zip |
xconfig: Fix the filename for GUI settings
Currently the qconf program invoked by 'make xconfig' stores GUI
settings in the file ~/.config/Unknown\ Organization.conf. This name
is apparently generated by the QSettings class when no organisation
or application name are specified.
This is obviously not a sensible filename (nor does it seem sensible
that these QSettings parameters are optional!). Pass the names
'kernel.org' and 'qconf', resuling in the filename
~/.config/kernel.org/qconf.conf.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-rw-r--r-- | scripts/kconfig/qconf.cc | 5 | ||||
-rw-r--r-- | scripts/kconfig/qconf.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 1500c38f0cca..9d3b04b0769c 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -69,6 +69,11 @@ static inline QString qgettext(const QString& str) return QString::fromLocal8Bit(gettext(str.latin1())); } +ConfigSettings::ConfigSettings() + : QSettings("kernel.org", "qconf") +{ +} + /** * Reads a list of integer values from the application settings. */ diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index 3715b3e7212c..bde0c6b6f9e8 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h @@ -32,6 +32,7 @@ class ConfigMainWindow; class ConfigSettings : public QSettings { public: + ConfigSettings(); Q3ValueList<int> readSizes(const QString& key, bool *ok); bool writeSizes(const QString& key, const Q3ValueList<int>& value); }; |