[PATCH] xconfig: Change the titlebar if using Qt3

[PATCH] xconfig: Change the titlebar if using Qt3

[Michal Marek]

Qt4 is now used by default and will get more testing. In case someone
still uses Qt3 and reports a bug, make it easy to recognize that this is
Qt3.

Cc: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
 scripts/kconfig/qconf.cc |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 88d3874..a04e451 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1274,8 +1274,14 @@ ConfigMainWindow::ConfigMainWindow(void)
 	char title[256];
 
 	QDesktopWidget *d = configApp->desktop();
-	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
-		getenv("KERNELVERSION"));
+	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration%s"),
+		getenv("KERNELVERSION"),
+#if QT_VERSION < 0x040000
+		" (Qt3)"
+#else
+		""
+#endif
+		);
 	setCaption(title);
 
 	width = configSettings->readNumEntry("/window width", d->width() - 64);
-- 
1.7.1

Re: [PATCH] xconfig: Change the titlebar if using Qt3

[Alexander Stein]

Hello Marek,

On Wednesday 01 September 2010 17:46:37 Michal Marek wrote:
> Qt4 is now used by default and will get more testing. In case someone
> still uses Qt3 and reports a bug, make it easy to recognize that this is
> Qt3.
> 
> Cc: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
> Signed-off-by: Michal Marek <mmarek@suse.cz>
> ---
>  scripts/kconfig/qconf.cc |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
> index 88d3874..a04e451 100644
> --- a/scripts/kconfig/qconf.cc
> +++ b/scripts/kconfig/qconf.cc
> @@ -1274,8 +1274,14 @@ ConfigMainWindow::ConfigMainWindow(void)
>  	char title[256];
> 
>  	QDesktopWidget *d = configApp->desktop();
> -	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
> -		getenv("KERNELVERSION"));
> +	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration%s"),
> +		getenv("KERNELVERSION"),
> +#if QT_VERSION < 0x040000
> +		" (Qt3)"
> +#else
> +		""
> +#endif
> +		);
>  	setCaption(title);
> 
>  	width = configSettings->readNumEntry("/window width", d->width() - 64);

Looks fine to me.

Best regards,
Alexander

Re: [PATCH] xconfig: Change the titlebar if using Qt3

[Michal Marek]

On 2.9.2010 18:52, Alexander Stein wrote:
> Hello Marek,
> 
> On Wednesday 01 September 2010 17:46:37 Michal Marek wrote:
>> Qt4 is now used by default and will get more testing. In case someone
>> still uses Qt3 and reports a bug, make it easy to recognize that this is
>> Qt3.
>>
>> Cc: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
>> Signed-off-by: Michal Marek <mmarek@suse.cz>
>> ---
>>  scripts/kconfig/qconf.cc |   10 ++++++++--
>>  1 files changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
>> index 88d3874..a04e451 100644
>> --- a/scripts/kconfig/qconf.cc
>> +++ b/scripts/kconfig/qconf.cc
>> @@ -1274,8 +1274,14 @@ ConfigMainWindow::ConfigMainWindow(void)
>>  	char title[256];
>>
>>  	QDesktopWidget *d = configApp->desktop();
>> -	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
>> -		getenv("KERNELVERSION"));
>> +	snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration%s"),
>> +		getenv("KERNELVERSION"),
>> +#if QT_VERSION < 0x040000
>> +		" (Qt3)"
>> +#else
>> +		""
>> +#endif
>> +		);
>>  	setCaption(title);
>>
>>  	width = configSettings->readNumEntry("/window width", d->width() - 64);
> 
> Looks fine to me.

OK, I committed it with "Acked-by: <you>"

thanks,
Michal