diff options
| author | Kevin Wright <kevin.wright@nokia.com> | 2010-07-27 08:29:37 (GMT) |
|---|---|---|
| committer | Kevin Wright <kevin.wright@nokia.com> | 2010-07-27 08:29:37 (GMT) |
| commit | 2b76b4fb7f91cc266a160420d12f0581cd87539a (patch) | |
| tree | c5c9b754f29c63295ab2c55ff8e1b837e02b2f8f /src/gui/kernel | |
| parent | a98af1c7f1bba3c791d08e76e4896e48ea6ea019 (diff) | |
| parent | 7b16419e61ea0ec2aa981b9600581f517addbb72 (diff) | |
| download | Qt-2b76b4fb7f91cc266a160420d12f0581cd87539a.zip Qt-2b76b4fb7f91cc266a160420d12f0581cd87539a.tar.gz Qt-2b76b4fb7f91cc266a160420d12f0581cd87539a.tar.bz2 | |
Merge branch '4.7' of http://git.scm.dev.nokia.troll.no/qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qpalette.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 98e8f66..38ec806 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -868,11 +868,21 @@ void QPalette::detach() Returns true (slowly) if this palette is different from \a p; otherwise returns false (usually quickly). + + \note The current ColorGroup is not taken into account when + comparing palettes + + \sa operator== */ /*! Returns true (usually quickly) if this palette is equal to \a p; otherwise returns false (slowly). + + \note The current ColorGroup is not taken into account when + comparing palettes + + \sa operator!= */ bool QPalette::operator==(const QPalette &p) const { |