diff options
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index a8a0968ff8..4ff466e04b 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -454,6 +454,9 @@ QDesktopWidget *qt_desktopWidget = 0; // root window widgets */ void QApplicationPrivate::process_cmdline() { + if (styleOverride.isEmpty() && qEnvironmentVariableIsSet("QT_STYLE_OVERRIDE")) + styleOverride = QString::fromLocal8Bit(qgetenv("QT_STYLE_OVERRIDE")); + if (!styleOverride.isEmpty()) { if (app_style) { delete app_style; @@ -1086,11 +1089,8 @@ QStyle *QApplication::style() // Compile-time search for default style // QString style; - QString envStyle = QString::fromLocal8Bit(qgetenv("QT_STYLE_OVERRIDE")); if (!QApplicationPrivate::styleOverride.isEmpty()) { style = QApplicationPrivate::styleOverride.toLower(); - } else if (!envStyle.isEmpty()) { - style = envStyle; } else { style = QApplicationPrivate::desktopStyleKey(); } |