1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix detection of the proxy base style when QT_STYLE_OVERRIDE is set

Browse Source 
QProxyStyle checks QApplicationPrivate::styleOverride but ignores
QT_STYLE_OVERRIDE when it is trying to detect the name of the base
style.
Set styleOverride from QT_STYLE_OVERRIDE to make it work. Thus there
is no need to check QT_STYLE_OVERRIDE from multiple places.

Change-Id: I2a64b5ff5443701f800ef5d2a9cb425068f909f1
Task-number: QTBUG-52596
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Alexander Volkov 2016-02-05 14:56:06 +03:00
parent 4c6b0cf5d5
commit 4d10e55d4d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/kernel/qapplication.cpp
View File

@ -464,6 +464,9 @@ QDesktopWidget *qt_desktopWidget = 0; // root window widgets
*/ */
void QApplicationPrivate::process_cmdline() void QApplicationPrivate::process_cmdline()
{ {
if (styleOverride.isEmpty() && qEnvironmentVariableIsSet("QT_STYLE_OVERRIDE"))
styleOverride = QString::fromLocal8Bit(qgetenv("QT_STYLE_OVERRIDE"));
if (!styleOverride.isEmpty()) { if (!styleOverride.isEmpty()) {
if (app_style) { if (app_style) {
delete app_style; delete app_style;
@ -1120,11 +1123,8 @@ QStyle *QApplication::style()
// Compile-time search for default style // Compile-time search for default style
// //
QString style; QString style;
QString envStyle = QString::fromLocal8Bit(qgetenv("QT_STYLE_OVERRIDE"));
if (!QApplicationPrivate::styleOverride.isEmpty()) { if (!QApplicationPrivate::styleOverride.isEmpty()) {
style = QApplicationPrivate::styleOverride; style = QApplicationPrivate::styleOverride;
} else if (!envStyle.isEmpty()) {
style = envStyle;
} else { } else {
style = QApplicationPrivate::desktopStyleKey(); style = QApplicationPrivate::desktopStyleKey();
} }