Fix kde149705 patch.
Hint: please don't make any "slight modifications" to my patches you're unsure about, they're almost definitely a mistake. ;-) In this case, we want to use widgetStyle4 only if it is defined, otherwise fall back to widgetStyle, which is the officially documented setting also in the GUI. So just changing widgetStyle to widgetStyle4 is wrong.
This commit is contained in:
parent
7e7988986d
commit
85bf2b2c5a
@ -18,7 +18,7 @@ diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde14
|
|||||||
const QString &defaultStyle = KStyle::defaultStyle();
|
const QString &defaultStyle = KStyle::defaultStyle();
|
||||||
const KConfigGroup pConfig(KGlobal::config(), "General");
|
const KConfigGroup pConfig(KGlobal::config(), "General");
|
||||||
- const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
|
- const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
|
||||||
+ const QString &styleStr = pConfig.readEntry("widgetStyle4", defaultStyle);
|
+ const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
|
||||||
|
|
||||||
if (styleStr.isEmpty() ||
|
if (styleStr.isEmpty() ||
|
||||||
// check whether we already use the correct style to return then
|
// check whether we already use the correct style to return then
|
||||||
|
Loading…
Reference in New Issue
Block a user