diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 11:58:17 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-03 11:58:17 (GMT) |
commit | 877505bc0029925598c754d535515ab9b4f027a2 (patch) | |
tree | e018ff3f496a163efd4366a180bbe285f4d4c707 /doc/src/snippets/code/src_script_qscriptengine.cpp | |
parent | a64d3dddfbe22b26fd0d2d1e7387ed7125951109 (diff) | |
parent | 67a02b1c2e73e76604aa24836a768673992e48d3 (diff) | |
download | Qt-877505bc0029925598c754d535515ab9b4f027a2.zip Qt-877505bc0029925598c754d535515ab9b4f027a2.tar.gz Qt-877505bc0029925598c754d535515ab9b4f027a2.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits)
Fix tst_collections::insert_remove_loop on 32bit
Fix warnings with clang
Add member-swap to shared datatypes that don't have it.
Containers: add member-swap
Fix license headers
Put more platform info in the report headers
QVarLenghtArray: Implement more API from QVector
Fixed index type after reapplying commit 89cbb165.
Reapply "Fixed painter path drawing on FBO without stencil buffer."
Fixes: Reading and writing PNG iTXt international text chunks
Fixes: corruption of whitespace in text fields when reading PNG images
Clean up some comments
Fixes unstability caused by a dangling pointer in GL text rendering
Fix getting git info on Win
Remove historic remains of qt3 testing
Testing auto-rebuild on server
Another change for running on actual server
Preparations for running on actual server
Add OS and git data to PlatformInfo
Revert "Don't define highp/mediump/lowp if desktop GL has them"
...
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions