diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 00:09:42 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-15 00:09:42 (GMT) |
commit | 385c245f578cfeb052f301d21ef2c898858f891d (patch) | |
tree | a8ff2355bddcc7dbecfbf4f95fa70cdc7d174b1b /src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp | |
parent | 50e4fbcfcac7f461236a5c8c97fb25802a9bb4e1 (diff) | |
parent | 301ec400cf5257d0ce5aec7ac4a9e7a0edf77ca3 (diff) | |
download | Qt-385c245f578cfeb052f301d21ef2c898858f891d.zip Qt-385c245f578cfeb052f301d21ef2c898858f891d.tar.gz Qt-385c245f578cfeb052f301d21ef2c898858f891d.tar.bz2 |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Fix for QMessageBox's autotest.
Fix for the button size calculation in qmessagebox.cpp
Remove font that may not exists in some OS X systems
Fix regression in styleName searching
Fix styleName listing with the same QtFontStyle::Key value
Fix localized font family access in OS X
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions