diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-20 14:43:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-20 14:43:43 (GMT) |
| commit | 304c70a03406eb16b9a08719769655b75bf6d8e3 (patch) | |
| tree | 2c82ee11c39dd54a7697eefde3546605a12648c7 /doc/src/snippets/code/src_script_qscriptengine.cpp | |
| parent | 2d5be8b2389eed8eae4b767ff0f4dd3901b28100 (diff) | |
| parent | 786d3c5dc1ba34d8f1a123f1fb100f21a5d7c26b (diff) | |
| download | Qt-304c70a03406eb16b9a08719769655b75bf6d8e3.zip Qt-304c70a03406eb16b9a08719769655b75bf6d8e3.tar.gz Qt-304c70a03406eb16b9a08719769655b75bf6d8e3.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: (115 commits)
Avoid calling WSAGetLastError() so often in nativeWrite
Cocoa: Fix painting errors on QGLWidget resizing.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff )
fix qm generation under windows
More changelog additions for QtWebKit
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )
fixes MMF plugin for Phonon when buidling with WINSCW
Update my changelog for 4.6.1
My changes for 4.6.1
doc: Corrected parameter value in snippet.
doc: This bug wasn't really a bug; it just required clarification.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )
Polish the changes file.
Copy changes file from 4.6 branch.
Changed log updated
Update change log with Yoann Lopes work.
Update changelog with some of my stuff
fix sametext and number heuristics
my 4.6.1 changelog contributions
Added changelog entries.
...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions