diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-17 17:05:03 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-17 17:05:03 (GMT) |
| commit | 9d63852e31674eb5de2da5cb57a09aff31aabb31 (patch) | |
| tree | 68ea264ebbdc1b9f63b5c2f8d28941b82fff55ad /src/gui/image/qpixmap_win.cpp | |
| parent | cbf6c5b810316efba3ccfb27f05576b8dbfe3890 (diff) | |
| parent | 64ad0c327c365713e320f981d99cdd255912b4d7 (diff) | |
| download | Qt-9d63852e31674eb5de2da5cb57a09aff31aabb31.zip Qt-9d63852e31674eb5de2da5cb57a09aff31aabb31.tar.gz Qt-9d63852e31674eb5de2da5cb57a09aff31aabb31.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
Diffstat (limited to 'src/gui/image/qpixmap_win.cpp')
0 files changed, 0 insertions, 0 deletions