QCombobox focus rect does not follow Windows 7

QCombobox focus rect differs from the native look'n' feel on Windows 7:
On windows 7, there is a slight margin between the focus rect and the widget border, and the rect does not include the drop down arrow.

See attached screenshot comparing a simple form written with Designer and a default windows box (Control Panel, Sound).

The issue is that the combobox is considered as a button in QWindowsVistaStyle, therefore the focus rect is drawn the same was as a button. It should be different.

While it looks a minor issue, customers complain that the focus is difficult to find when the form is a bit crowded.