diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 13:14:41 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 13:14:41 (GMT) | 
| commit | b6e2d52f08727d370ee6403ef9099165b56b39c9 (patch) | |
| tree | f55f58395c2905af4ece1de6ff5c765b69a03841 /doc/src/snippets/code/doc_src_qcache.cpp | |
| parent | 14de8cecfa5b5428d597c9cca111ee0f3f89502f (diff) | |
| parent | bbab5a5dd8274aadc15ef209a08632fde8baeee0 (diff) | |
| download | Qt-b6e2d52f08727d370ee6403ef9099165b56b39c9.zip Qt-b6e2d52f08727d370ee6403ef9099165b56b39c9.tar.gz Qt-b6e2d52f08727d370ee6403ef9099165b56b39c9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Manually amend latin1 change
  QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfer with touch event propagation
  suppress warnings about ASCII to QString conversion
  take the user defined temp dir into account
  Compilation break in MSVC2008 and MSVC2005
  Remove useless LFLAGS
  Add docs for QNetworkConfigurationManager's time-consuming constructor.
  rebuild configure
  fix configure.exe option -opengl desktop
  use mkdir -p for mingw+sh
  Ensure the right font is used for rendering text on Mac
  QDirIterator returns hidden directories when it should only return files
  Update Polish translations
  L10n: Update German translations.
Diffstat (limited to 'doc/src/snippets/code/doc_src_qcache.cpp')
0 files changed, 0 insertions, 0 deletions
