diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 22:25:52 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 22:25:52 (GMT) | 
| commit | bb382d523710454dadb50214d5a2fad6fd8dd02c (patch) | |
| tree | 8f05677400a53b172102d94dbadda57bf71a02d9 /doc/src/snippets/code/src_script_qscriptengine.cpp | |
| parent | 0cfa6daa4776cd78370e644fae3005ae432b83c7 (diff) | |
| parent | 7eb9cf865f2b40ca3ca4bf8655b6bb6d40d6fcdd (diff) | |
| download | Qt-bb382d523710454dadb50214d5a2fad6fd8dd02c.zip Qt-bb382d523710454dadb50214d5a2fad6fd8dd02c.tar.gz Qt-bb382d523710454dadb50214d5a2fad6fd8dd02c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
  Fixed handling of QInputMethodEvents with nonzero replacementLength.
  Fixed namespace issues related to epocroot.cpp
  Corrected ASCII comparison and removed extra braces
  Add symbian scope for qfiledialog_symbian.cpp
  Resolve EPOCROOT in qt.conf using same logic as in .pro
  Make epocroot resolving compatible with more build environments
  Fix for QtOpenGL RVCT4 compilation error
  Removed extra cpp and done changes based on comments
  Correct flags for Symbian file dialogs
  Fix for WServ 64 crash on Symbian.
  Use include(original mkspec) instead of copying of mkspec to default
  Fixed code style of d92cbfc5, reported by git push.
  Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
  Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
  Documented usage of dialogs on Symbian
  Native file dialog on Symbian^3
  Add Location as self signable capability in patch_capabilities.pl
  Localize .loc and .pkg content based on TRANSLATIONS
  Bump Qt version to 4.7.2.
  SSL: Fix for systemCaCertificates being called first on symbian
  ...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions
