diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-04 23:31:23 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-04 23:31:23 +1000 |
| commit | d707b3722bf8781b79c2b88e8a99485a9687c4c8 (patch) | |
| tree | 5ed6a2084a4968c3600ccf74ef5d608743c5792e /doc/src/snippets/code/src_script_qscriptvalueiterator.cpp | |
| parent | 9fdee69ef3d08f37a2a4f5daceb4606aa5c7ae9b (diff) | |
| parent | 66aafe42f9076c0d70037ee8fad0e382828ed7bb (diff) | |
| download | qt4-tools-d707b3722bf8781b79c2b88e8a99485a9687c4c8.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix ordinal number conflict
QPainterPath: Ignore calls with NaN/Infinite parameters
memory leak fix
Fixes crash in QWidget::effectiveWinId.
Revert symbol addition in b033bb9
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptvalueiterator.cpp')
0 files changed, 0 insertions, 0 deletions