diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-04-21 12:22:24 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-04-21 12:22:24 (GMT) |
| commit | 51dca5f8afc3aa619a3bb62858db78a85cc3ecef (patch) | |
| tree | dfc1fb65b6a8e5e429f1701992548f8a0425decb /src/gui/image/qpixmap_s60.cpp | |
| parent | 6f5ad5dcab8e6f702894c4fa5c016d9837375626 (diff) | |
| parent | c74dac2a0ef5d1b428c4da4e48fab05f9886233a (diff) | |
| download | Qt-51dca5f8afc3aa619a3bb62858db78a85cc3ecef.zip Qt-51dca5f8afc3aa619a3bb62858db78a85cc3ecef.tar.gz Qt-51dca5f8afc3aa619a3bb62858db78a85cc3ecef.tar.bz2 | |
Merge remote branch 'origin/4.7' into lighthouse
Conflicts:
configure
src/gui/kernel/qapplication.cpp
src/gui/painting/qbackingstore.cpp
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/plugins/plugins.pro
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
tools/tools.pro
Diffstat (limited to 'src/gui/image/qpixmap_s60.cpp')
0 files changed, 0 insertions, 0 deletions