diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-29 16:10:12 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-29 16:10:12 (GMT) |
commit | 139235cfc51bcf152610747cfc09d72bdea081bd (patch) | |
tree | d9701819135f04ddfa64c210d7ba807e52cc72b3 /src/gui/widgets/qlineedit.cpp | |
parent | a3504361a19428c12ac7e044762f252d8ba2b26f (diff) | |
parent | 65e0d7c3b63fc4c1d7df7603b926ca013794b321 (diff) | |
download | Qt-139235cfc51bcf152610747cfc09d72bdea081bd.zip Qt-139235cfc51bcf152610747cfc09d72bdea081bd.tar.gz Qt-139235cfc51bcf152610747cfc09d72bdea081bd.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/gui/widgets/qlineedit.cpp')
-rw-r--r-- | src/gui/widgets/qlineedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index e243ad0..d16ed10 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -2518,7 +2518,7 @@ void QLineEdit::paintEvent(QPaintEvent *) // draw text, selections and cursors #ifndef QT_NO_STYLE_STYLESHEET if (QStyleSheetStyle* cssStyle = qobject_cast<QStyleSheetStyle*>(style())) { - cssStyle->focusPalette(this, &panel, &pal); + cssStyle->styleSheetPalette(this, &panel, &pal); } #endif p.setPen(pal.text().color()); |