diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-11 12:51:23 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-11-11 12:51:23 +0100 |
| commit | 9d38dbde7663a2de8186b32e222ce8fab9cf909d (patch) | |
| tree | b859ad71c3750f4cd7c2d383cc9f15cb0e0c6d7f /src/widgets/styles/qwindowsvistastyle.cpp | |
| parent | 9b7bdd455fefc2df78eb540e9f570877aa8cd827 (diff) | |
| parent | 0d02a06517f29c5b51fb2d3ac64a5e6d9daed5a9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0
Diffstat (limited to 'src/widgets/styles/qwindowsvistastyle.cpp')
| -rw-r--r-- | src/widgets/styles/qwindowsvistastyle.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp index 007952192a..463b120e04 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -1473,7 +1473,11 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption break; } #endif // QT_NO_ITEMVIEWS - +#ifndef QT_NO_COMBOBOX + case CE_ComboBoxLabel: + QCommonStyle::drawControl(element, option, painter, widget); + break; +#endif // QT_NO_COMBOBOX default: QWindowsXPStyle::drawControl(element, option, painter, widget); break; |