diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-15 15:38:48 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-15 15:38:48 (GMT) | 
| commit | ab90235dfa1874e5c70875ed9b68817e698a55b3 (patch) | |
| tree | 819e6302328b79ddef9cf97246949f57d885dd30 /doc/src/snippets/code/src_script_qscriptable.cpp | |
| parent | 04d0a534c6fe64d308652da2ada109c7d6bd72ed (diff) | |
| parent | e5fe06c4b76eea0f1755419bfb6b89325824a852 (diff) | |
| download | Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.zip Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.tar.gz Qt-ab90235dfa1874e5c70875ed9b68817e698a55b3.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Revert accidental commit
  Rework threading internals in XmlListModel to avoid global static
  Fix undesirable VKB popup at task switch
  Fix compile errors on S60 3.2
  Fix to QGLWidget rendering with VG graphics system
  Symbian/gcce: Remove the useless -T flag
  Fix installation on S60 5.0
  Fix fancybrowser.pro
  Move cursorDelegate with the mouse selection of read only text input.
  Ignore child elements in non-application caption/pkg name translations
  Updating libpng: Patches to libpng 1.5.4 for building it in Qt
  Updating libpng: Add libpng version 1.5.4
  Updating libpng: Remove version 1.4.0
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptable.cpp')
0 files changed, 0 insertions, 0 deletions
