diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-12 15:39:28 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-12 15:39:28 (GMT) |
| commit | 3723f30a91eda1c1b247598913cfc02b001a02c9 (patch) | |
| tree | 234241d0d6dbbf29857c4e66d2723f77239f31ee /src/gui/image/qbitmap.h | |
| parent | 6f736694461edc25b6e757f40ab9cad6a9207ad4 (diff) | |
| parent | 957f36cb498657f94f1b5b92f52713254ff8c051 (diff) | |
| download | Qt-3723f30a91eda1c1b247598913cfc02b001a02c9.zip Qt-3723f30a91eda1c1b247598913cfc02b001a02c9.tar.gz Qt-3723f30a91eda1c1b247598913cfc02b001a02c9.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
Diffstat (limited to 'src/gui/image/qbitmap.h')
0 files changed, 0 insertions, 0 deletions