diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 22:40:42 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 22:40:42 (GMT) | 
| commit | bd145e708d97ffb5a68bf53bbdf04b8df8ea4a9b (patch) | |
| tree | 57fea5e3724c841344924d74d451a26ded978e71 /doc/src/snippets/code/src_script_qscriptcontext.cpp | |
| parent | ecf66e5825d186f57468c6bf682dce32c0cd96d7 (diff) | |
| parent | 6f329da7066de32455ad8ad08a4b617a4a090dd3 (diff) | |
| download | Qt-bd145e708d97ffb5a68bf53bbdf04b8df8ea4a9b.zip Qt-bd145e708d97ffb5a68bf53bbdf04b8df8ea4a9b.tar.gz Qt-bd145e708d97ffb5a68bf53bbdf04b8df8ea4a9b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Tidy the changes file.
  Skip the transparent pixels when doing the sourceOver
  Refactor comp_func_solid_Clear() and comp_func_solid_Source()
  Add mingw-specific expected failures for JS test suite
  QNAM HTTP: Forgot to remove a qDebug()
  QNAM HTTP: Reserve bytes for HTTP parsing
  Add platform-specific expected failures for JS test suite
  Skip test that crashes on win32-g++
  QNetworkCookie(Jar): fix includes
  QNAM HTTP: Improve readHeader() of the HTTP reply
  Add QSKIP to functionEntryAndExit_builtin.
  QNAM HTTP: Improve parseStatus() of HTTP reply
  Demo browser: Better handleUnsupportedContent implementation
  demo browser: Fix the way warnings were (not) displayed
  doc:	Updated deployment OS X requirements for 4.6
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptcontext.cpp')
0 files changed, 0 insertions, 0 deletions
