diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 08:04:03 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 08:04:03 (GMT) | 
| commit | 95d5218439c3e6df039e86a70d318a62558b196d (patch) | |
| tree | 118a24cc6a3df3b3fcb4b7126235551c3f442c38 /doc/src/snippets/code/src_script_qscriptengine.cpp | |
| parent | 7b18baf23b1e8c663872b2b25b1323798b1d09df (diff) | |
| parent | 8a3699622745ce35d2983f10ad8ae8f04ff380cf (diff) | |
| download | Qt-95d5218439c3e6df039e86a70d318a62558b196d.zip Qt-95d5218439c3e6df039e86a70d318a62558b196d.tar.gz Qt-95d5218439c3e6df039e86a70d318a62558b196d.tar.bz2 | |
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:
  opengl2: Make maximum cached glyph size configurable
  QWS: fix the software/hardware cursor switcher
  Fix horizontal centered text drawing without word wrap
  Remove Font Smoothing hack for OS X
  Revert "Fixed underline offset after raster coordinate system change."
  Fix the painting for widgets painting directly on screen.
  Fixed bad merges in GL windowsurface and get rid of redundant variable.
  Added WindowSurfaceFeature enum to QWindowSurface.
  Added preserved contents property to QWindowSurface.
  Fixed underline offset after raster coordinate system change.
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions
