diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-10 20:12:01 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-10 20:12:01 +1000 |
| commit | 359073d92be05d0a66a4310edc02c6b65d5b5d86 (patch) | |
| tree | c60bb5e6daca3462acf248e26487b2e7291207b0 /doc/src/snippets/code/src_script_qscriptengine.cpp | |
| parent | 865ccc15029d49e72a16a20cc72c268b0e9944c2 (diff) | |
| parent | 68de09f538ae1103a3104e0fba1086ea93581b6e (diff) | |
| download | qt4-tools-359073d92be05d0a66a4310edc02c6b65d5b5d86.tar.gz | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
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 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions