diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-01 09:23:51 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-01 09:23:51 (GMT) |
| commit | ee767e8c16742316068e83323374ea54f2b939cb (patch) | |
| tree | bb3f6c94e6c1512545cd657d2c675a371a6a88f7 /src/declarative/graphicsitems/qdeclarativetranslate_p.h | |
| parent | 54869c8727e5403cea866c99a5f83ae9c8533f82 (diff) | |
| parent | 2653c4fcf42ec93db16a299c29c9fe0f98680c75 (diff) | |
| download | Qt-ee767e8c16742316068e83323374ea54f2b939cb.zip Qt-ee767e8c16742316068e83323374ea54f2b939cb.tar.gz Qt-ee767e8c16742316068e83323374ea54f2b939cb.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/text/qfontengine_mac.mm
src/opengl/qpixmapdata_gl.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
tests/auto/qtextlayout/tst_qtextlayout.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetranslate_p.h')
0 files changed, 0 insertions, 0 deletions