diff options
| author | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2010-09-28 10:56:35 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2010-09-28 10:56:35 (GMT) |
| commit | aef084fc06e325c9b206c274d5b297660b7c671f (patch) | |
| tree | e415161d5200d2eee7a098c8f5e411a486178a47 /src/gui/widgets/qcombobox.cpp | |
| parent | ae5f7005c709165f847445aca746b5b338341121 (diff) | |
| download | Qt-aef084fc06e325c9b206c274d5b297660b7c671f.zip Qt-aef084fc06e325c9b206c274d5b297660b7c671f.tar.gz Qt-aef084fc06e325c9b206c274d5b297660b7c671f.tar.bz2 | |
Fix a color propagation issue with Combobox line edit
Some pixmap based themes were affected by this issue since they
needed to resolve the palette against the widget and the lineedit
palette was already resolved. We now set the palette on the lineedit
when you modify the parent palette. You can still maintain a separate
palette on the lineedit, but you have to set it after the parent has
been set. We can remove some workarounds for plastique and vista style
due to this.
Task-number: QTBUG-5950
Reviewed-by: ogoffart
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 21dd127..b857e94 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -1089,6 +1089,8 @@ void QComboBoxPrivate::updateViewContainerPaletteAndOpacity() container->setPalette(q->palette()); container->setWindowOpacity(1.0); } + if (lineEdit) + lineEdit->setPalette(q->palette()); } /*! |