diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-23 08:55:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-23 08:55:49 (GMT) |
| commit | 03ee83e15de7f5091d7322ac5765daec652b4b3e (patch) | |
| tree | e92442160ea6df2cbae30621c1727b9a689675bc /src/scripttools/scripttools.pro | |
| parent | 3b705ed3fb5d485171ebd6132846ced88abd7187 (diff) | |
| parent | 61f214e60a074cbaf2413b2c77ed5a4cfd638edb (diff) | |
| download | Qt-03ee83e15de7f5091d7322ac5765daec652b4b3e.zip Qt-03ee83e15de7f5091d7322ac5765daec652b4b3e.tar.gz Qt-03ee83e15de7f5091d7322ac5765daec652b4b3e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Implement ScaledClipRect in the jpeg image plugin
Add support for ClipRect to the jpeg image plugin
Use libjpeg's builtin scaler for implementing setScaledSize()
Use 3x3 PMV matrices rather than 4x4 in the GL2 engine
Handle broken shaders better in the GL2 engine's shader manager
Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram
Fix build with neon instructions enabled but not set in mkspec
Diffstat (limited to 'src/scripttools/scripttools.pro')
0 files changed, 0 insertions, 0 deletions