diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-10-06 14:21:31 -0400 |
|---|---|---|
| committer | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-10-08 17:52:16 -0400 |
| commit | 00d4f8fc2c729b1baf723cacd2b5942b032b6784 (patch) | |
| tree | dae8c6a4797d1d10228907264f3034f9c75e4fb6 /scripts | |
| parent | 503c823048e81cc85c0e9d8c297cc70203e335e5 (diff) | |
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>
Diffstat (limited to 'scripts')
| -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) | |||
| 69 | return QString::fromLocal8Bit(gettext(str.latin1())); | 69 | return QString::fromLocal8Bit(gettext(str.latin1())); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | ConfigSettings::ConfigSettings() | ||
| 73 | : QSettings("kernel.org", "qconf") | ||
| 74 | { | ||
| 75 | } | ||
| 76 | |||
| 72 | /** | 77 | /** |
| 73 | * Reads a list of integer values from the application settings. | 78 | * Reads a list of integer values from the application settings. |
| 74 | */ | 79 | */ |
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; | |||
| 32 | 32 | ||
| 33 | class ConfigSettings : public QSettings { | 33 | class ConfigSettings : public QSettings { |
| 34 | public: | 34 | public: |
| 35 | ConfigSettings(); | ||
| 35 | Q3ValueList<int> readSizes(const QString& key, bool *ok); | 36 | Q3ValueList<int> readSizes(const QString& key, bool *ok); |
| 36 | bool writeSizes(const QString& key, const Q3ValueList<int>& value); | 37 | bool writeSizes(const QString& key, const Q3ValueList<int>& value); |
| 37 | }; | 38 | }; |
