diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-05-03 11:32:16 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-05-03 11:32:16 (GMT) |
| commit | 7cdfc35b5601b5612f4baa6d3905f2b957091dd0 (patch) | |
| tree | dd472b70d24b95126e93128fb84f644c2ef5fcaf /src/gui/kernel/qpalette.cpp | |
| parent | b2e7709b55559ca20f627dff443b517421892779 (diff) | |
| parent | c8e08e5c74fbdae8a60bdd9b08966ea7fc728845 (diff) | |
| download | Qt-7cdfc35b5601b5612f4baa6d3905f2b957091dd0.zip Qt-7cdfc35b5601b5612f4baa6d3905f2b957091dd0.tar.gz Qt-7cdfc35b5601b5612f4baa6d3905f2b957091dd0.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/kernel/qpalette.cpp')
| -rw-r--r-- | src/gui/kernel/qpalette.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 6e8c90e..98e8f66 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -795,7 +795,7 @@ const QBrush &QPalette::brush(ColorGroup gr, ColorRole cr) const /*! \fn void QPalette::setColor(ColorGroup group, ColorRole role, const QColor &color) - Sets the brush in the specified color \a group, used for the given + Sets the color in the specified color \a group, used for the given color \a role, to the specified solid \a color. \sa setBrush() color() ColorRole |