diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-09 05:03:09 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-09 05:03:09 (GMT) |
commit | a8ce59cec98249f0058acbfb82a83957f4cc37c0 (patch) | |
tree | 63803f08d01635ea8f980aded792c91de26859a2 /doc/src/snippets/code/src_script_qscriptengineagent.cpp | |
parent | 5f39895351abfa0bd512cf5253149545ea5d3ce5 (diff) | |
parent | f59908d4a6edcd333a156d4c94ddbd9b30f7e810 (diff) | |
download | Qt-a8ce59cec98249f0058acbfb82a83957f4cc37c0.zip Qt-a8ce59cec98249f0058acbfb82a83957f4cc37c0.tar.gz Qt-a8ce59cec98249f0058acbfb82a83957f4cc37c0.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Export QGLShareRegister because qgl_share_reg() is exported
Fix upside down PVR compressed textures.
Make sure a context is current when loading compressed textures.
Fix possible off-by-one inconsistency against system look and feel when
Fixes broken graphics effect auto tests.
Doc: Explicitly mention that QWidget/QGraphicsItem takes ownership of effects.
Remove id property from QGraphicsObject
Minor fixes to softkey dimming support (commit 245c9cc0).
FEP returns the wrong foreground color in GetFormatOfFepInlineText
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengineagent.cpp')
0 files changed, 0 insertions, 0 deletions