From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f174.google.com ([209.85.212.174]:47445 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753350Ab3JHVde (ORCPT ); Tue, 8 Oct 2013 17:33:34 -0400 Received: by mail-wi0-f174.google.com with SMTP id hj3so7329607wib.7 for ; Tue, 08 Oct 2013 14:33:33 -0700 (PDT) Date: Tue, 8 Oct 2013 23:33:29 +0200 From: "Yann E. MORIN" Subject: Re: [PATCH] xconfig: Fix the filename for GUI settings Message-ID: <20131008213329.GC3373@free.fr> References: <1381083691.2788.28.camel@deadeye.wl.decadent.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1381083691.2788.28.camel@deadeye.wl.decadent.org.uk> Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: Ben Hutchings Cc: linux-kbuild@vger.kernel.org, Michal Marek Ben, All, On 2013-10-06 19:21 +0100, Ben Hutchings spake thusly: > 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. I'll take this in my tree for 3.13. Thanks! Regards, Yann E. MORIN. > Signed-off-by: Ben Hutchings > --- > scripts/kconfig/qconf.cc | 5 +++++ > scripts/kconfig/qconf.h | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc > index 1500c38..9d3b04b 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 3715b3e..bde0c6b 100644 > --- a/scripts/kconfig/qconf.h > +++ b/scripts/kconfig/qconf.h > @@ -32,6 +32,7 @@ class ConfigMainWindow; > > class ConfigSettings : public QSettings { > public: > + ConfigSettings(); > Q3ValueList readSizes(const QString& key, bool *ok); > bool writeSizes(const QString& key, const Q3ValueList& value); > }; > > -- > Ben Hutchings > Who are all these weirdos? - David Bowie, reading IRC for the first time -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'