diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 18:04:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 18:04:19 (GMT) |
| commit | b20ef0ade0aec89b969bd0ae7f754c680e390c67 (patch) | |
| tree | 9a91ea4dd498684fb5236512f427d2dc2ea03b47 /src/gui/util/qsystemtrayicon_mac.mm | |
| parent | c6ac9fe2e8d219bb9694efaf5b25ec5108fb8fa6 (diff) | |
| parent | 7d587efef35b3adbb3433a4baec1c5ee7105cf0b (diff) | |
| download | Qt-b20ef0ade0aec89b969bd0ae7f754c680e390c67.zip Qt-b20ef0ade0aec89b969bd0ae7f754c680e390c67.tar.gz Qt-b20ef0ade0aec89b969bd0ae7f754c680e390c67.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:
Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl API
Make QEgl::createSurface store the surface in the pixmapdata too
Make QEgl::ConfigOptions use QFlags
Diffstat (limited to 'src/gui/util/qsystemtrayicon_mac.mm')
0 files changed, 0 insertions, 0 deletions