diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 18:06:01 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-29 18:06:01 +1000 |
commit | 4349792c3cf6851fd11f48a9bb0014371182fd51 (patch) | |
tree | a0add7eaa37c18103fe0facc51b9678acdf66f3d /src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp | |
parent | dd400b8eda22e6a1261b1178a290939f309d0a12 (diff) | |
parent | b0fc1edf039d4755b2c73c04f5cf7b354cde8aee (diff) | |
download | qt4-tools-4349792c3cf6851fd11f48a9bb0014371182fd51.tar.gz |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed off-by-one in radial gradient color table index computation.
Support more items for QTextCharFormat::VerticalAlignment enum for custom text objects.
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercodewidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions