diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 13:09:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 13:09:34 (GMT) |
| commit | ec0f388dfb14712a144d534296b33df7e6a2df7f (patch) | |
| tree | ab4d6b9da547a6439ae6f434a69ee3f202d328d7 /tests/benchmarks/qpixmapcache | |
| parent | 6165ab0203fa80d31f3488ead7e7f7c088c8668c (diff) | |
| parent | 3b1a0c4877faa9d1d50372f2128c06530ae4b2d4 (diff) | |
| download | Qt-ec0f388dfb14712a144d534296b33df7e6a2df7f.zip Qt-ec0f388dfb14712a144d534296b33df7e6a2df7f.tar.gz Qt-ec0f388dfb14712a144d534296b33df7e6a2df7f.tar.bz2 | |
Merge remote branch 'qt/4.6' into qt-master-from-4.6
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
Diffstat (limited to 'tests/benchmarks/qpixmapcache')
0 files changed, 0 insertions, 0 deletions