diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 20:04:21 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 20:04:21 (GMT) |
commit | 1c8395fc89e48c59805d19f62c5ce3d52c57ec65 (patch) | |
tree | c2e8c4972bdf3596730a79319844050cdf32fd7b /src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp | |
parent | 67c465988a45d1f0a5d9dce3c03ad544a6e24cfe (diff) | |
parent | 965516d4ed2f600b28ee730d4dfbdc083ecdbac4 (diff) | |
download | Qt-1c8395fc89e48c59805d19f62c5ce3d52c57ec65.zip Qt-1c8395fc89e48c59805d19f62c5ce3d52c57ec65.tar.gz Qt-1c8395fc89e48c59805d19f62c5ce3d52c57ec65.tar.bz2 |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Add missing data for the autotest of in-place conversion for Pixmap
Avoid in-place convertion of images with multiple references
Fix infinite loop when justifying undisplayable Arabic text
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions