diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 17:23:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 17:23:57 (GMT) |
| commit | 4809920df3c3329d47f595c1287ab44b454abb88 (patch) | |
| tree | affbce24e8018cdf82857ca2368f0d132bd4a20c /src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp | |
| parent | 6a786ab4bb4a5e1d80ce511461f2018237f1614a (diff) | |
| parent | f0c1f381af7d6338ded9f65d00ed54b1b9405ba9 (diff) | |
| download | Qt-4809920df3c3329d47f595c1287ab44b454abb88.zip Qt-4809920df3c3329d47f595c1287ab44b454abb88.tar.gz Qt-4809920df3c3329d47f595c1287ab44b454abb88.tar.bz2 | |
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:
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/qscriptdebuggerscriptedconsolecommand.cpp')
0 files changed, 0 insertions, 0 deletions