diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 18:45:19 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 18:45:19 (GMT) | 
| commit | e3f05380d79ca9b23c120b496104ea44b5ab5b5a (patch) | |
| tree | 98d8f73577cd5690465bbe8a62516694f27f099c /doc/src/snippets/code/src_script_qscriptable.cpp | |
| parent | afef0789d8dd3ac2611f0c136e026d7d9cfa68f6 (diff) | |
| parent | 032fb3d54eaaa1fa36ec45b37f5f7356b1137830 (diff) | |
| download | Qt-e3f05380d79ca9b23c120b496104ea44b5ab5b5a.zip Qt-e3f05380d79ca9b23c120b496104ea44b5ab5b5a.tar.gz Qt-e3f05380d79ca9b23c120b496104ea44b5ab5b5a.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:
  Add the Qt::TextBypassShaping flag.
  QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
  Add my 4.7.0 changes
  qdoc: Added DITA XML generator
  doc: Fixed confusing ownership issue.
  update Russian translations for Qt tools
  update Russian translation for Qt libraries
  QXmlSchema documentation correction
  doc: Changed last breadcrumb to not be a link.
  doc: Fixed reference to setSize(), which is in QRectF.
  QNetworkCookie: do not accept cookies with non-alNum domain
  QtDeclarative: Remove trailing commas in enums
  Doc: MonotonicClock is obviously monotonic
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptable.cpp')
0 files changed, 0 insertions, 0 deletions
