diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 17:33:12 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 17:33:12 +0200 |
| commit | 73fc68802d8c0c8d3d499b279782ce270f1c5bc6 (patch) | |
| tree | 8cd7f54bc06864a741f0a2fd34412124c53e5953 /src/declarative/qml/qperformancetimer.cpp | |
| parent | 9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc (diff) | |
| parent | 570f8970bea646055583671397c3d2706ac45004 (diff) | |
| download | qt4-tools-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.tar.gz | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
Diffstat (limited to 'src/declarative/qml/qperformancetimer.cpp')
0 files changed, 0 insertions, 0 deletions