diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 09:12:04 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 09:12:04 (GMT) |
commit | 5888ac21097dd718fc81d05987213391b923ea6d (patch) | |
tree | f33da7a7097c8ab24903938f4862dcc3bac23ff7 /doc/src/snippets/qmacnativewidget/main.mm | |
parent | df6549d1b95af017305744af04a7bb3b10025660 (diff) | |
parent | f8c82039e9b665cabaf605a3d363108e732d8205 (diff) | |
download | Qt-5888ac21097dd718fc81d05987213391b923ea6d.zip Qt-5888ac21097dd718fc81d05987213391b923ea6d.tar.gz Qt-5888ac21097dd718fc81d05987213391b923ea6d.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Make QPalette::operator== return false if the currentColorGroup differs"
Make QPalette::operator== return false if the currentColorGroup differs
Fix the CGContext on Mac OS X. Sometimes we got
Diffstat (limited to 'doc/src/snippets/qmacnativewidget/main.mm')
0 files changed, 0 insertions, 0 deletions