summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-28 11:04:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-28 11:04:15 (GMT)
commit2fab427e4c30a81ea73b8fa1a3f6fee9706caad0 (patch)
treee415161d5200d2eee7a098c8f5e411a486178a47 /dist
parent2868302626b8a31f44df1068514485a89ec27171 (diff)
parentaef084fc06e325c9b206c274d5b297660b7c671f (diff)
downloadQt-2fab427e4c30a81ea73b8fa1a3f6fee9706caad0.zip
Qt-2fab427e4c30a81ea73b8fa1a3f6fee9706caad0.tar.gz
Qt-2fab427e4c30a81ea73b8fa1a3f6fee9706caad0.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a color propagation issue with Combobox line edit
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.8.01
1 files changed, 1 insertions, 0 deletions
diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0
index 0c28274..f8ca4bc 100644
--- a/dist/changes-4.8.0
+++ b/dist/changes-4.8.0
@@ -42,6 +42,7 @@ QtGui
-----
- QTabBar: reduced minimumSizeHint if ElideMode is set.
+ - QComboBox: Fixed a color propagation issue with the lineedit. [QTBUG-5950]
QtOpenGL
--------