diff options
| author | Bjoern Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-04-07 10:59:16 (GMT) |
|---|---|---|
| committer | Bjoern Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-04-07 10:59:16 (GMT) |
| commit | 6e13559503040963c28dd8f5b6881e3a2b9d5596 (patch) | |
| tree | 3e030548ffb1667d5fa8cd2020fd7b28749d0411 /qmake/option.h | |
| parent | 939623b2bc8e441618ee1a1886cc656880bee62b (diff) | |
| parent | d8f76432c3937690c37972136c02a5a264bc941f (diff) | |
| download | Qt-6e13559503040963c28dd8f5b6881e3a2b9d5596.zip Qt-6e13559503040963c28dd8f5b6881e3a2b9d5596.tar.gz Qt-6e13559503040963c28dd8f5b6881e3a2b9d5596.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/painting/qtransform.cpp
Diffstat (limited to 'qmake/option.h')
0 files changed, 0 insertions, 0 deletions