diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-25 21:36:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-25 21:36:38 (GMT) |
| commit | 32fe76c36a9cb0ec5121e43e78032b862d5286f3 (patch) | |
| tree | 5efe71302f85ea34590951d0f65faf1c3ef96488 /src/gui/kernel | |
| parent | a847edefd9e2efd70e63935965624354406f932d (diff) | |
| parent | c00b6a953d08fe9b13fa61f1e4acdb937885aa03 (diff) | |
| download | Qt-32fe76c36a9cb0ec5121e43e78032b862d5286f3.zip Qt-32fe76c36a9cb0ec5121e43e78032b862d5286f3.tar.gz Qt-32fe76c36a9cb0ec5121e43e78032b862d5286f3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize tst_qlineedit.cpp
QScriptEngineAgent: ensure that the top of the backtrace is correct in exceptionThrow
Fix QLineEdit's Highlight color when inactive.
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 { |