diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-27 09:18:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-27 09:18:05 +0200 |
| commit | 23a36fd2bfcdb57849deaa1e10e6e3f7b1156ed8 (patch) | |
| tree | b527c7e3ba4a831b542b0bccfb6a5a748a8a4fd9 /src/widgets/styles/qwindowsvistastyle.cpp | |
| parent | c003a18ee332abf2387172eb0856a176a32a6c8f (diff) | |
| parent | 072f5b513e486e884ea7fa4a1cac9aedf3846374 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/io/qprocess_win.cpp
src/widgets/itemviews/qheaderview.cpp
Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761
Diffstat (limited to 'src/widgets/styles/qwindowsvistastyle.cpp')
| -rw-r--r-- | src/widgets/styles/qwindowsvistastyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp index a0bc924dd9..dce0a93e10 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -1149,7 +1149,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption if (!proxy()->styleHint(SH_UnderlineShortcut, mbi, widget)) alignment |= Qt::TextHideMnemonic; - if (widget) { // Not needed for QtQuick Controls + if (widget && mbi->palette.color(QPalette::Window) != Qt::transparent) { // Not needed for QtQuick Controls //The rect adjustment is a workaround for the menu not really filling its background. XPThemeData theme(widget, painter, QWindowsXPStylePrivate::MenuTheme, |