summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-04 05:19:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-04 05:19:03 (GMT)
commit8e98033a67263f6a2d9155f228dc28e2faee4f5e (patch)
treee2e4cf7c5f7c890fc5e8935dd57ac98e2d80de96
parentbd202b822401989aa1abe3e2ad24344d71d6dfb3 (diff)
parent264f4451667e7da90e63cf87a2b4a6eb72a14d3b (diff)
downloadQt-8e98033a67263f6a2d9155f228dc28e2faee4f5e.zip
Qt-8e98033a67263f6a2d9155f228dc28e2faee4f5e.tar.gz
Qt-8e98033a67263f6a2d9155f228dc28e2faee4f5e.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: Rhys Weatherley's changes for 4.6.2
-rw-r--r--dist/changes-4.6.29
1 files changed, 7 insertions, 2 deletions
diff --git a/dist/changes-4.6.2 b/dist/changes-4.6.2
index d768988..00509ed 100644
--- a/dist/changes-4.6.2
+++ b/dist/changes-4.6.2
@@ -67,8 +67,13 @@ QtNetwork
QtOpenGL
--------
- - foo
- * bar
+ - [QTBUG-7490] Better support for user-generated binary shaders.
+
+QtOpenVG
+--------
+
+ - [QTBUG-7791] Optimize single-rect IntersectClip in OpenVG using the scissor.
+ - [QTBUG-7864] Use OpenVG scissor on 90/180/270 rotations and simple clips.
QtScript
--------