diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-27 12:48:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-27 12:48:16 (GMT) |
| commit | 41fbe7440778f36afe85608d1198c96de387148f (patch) | |
| tree | cd5ffd08e11d059aab70d9565a7dfe112d4e1363 /src/opengl/util/glsl_to_include.sh | |
| parent | 103e1e8ea5e8879f2bb97e008840a212b3004a51 (diff) | |
| parent | 773cfe5b87e8f92aba1e5648dc57f559c6e43741 (diff) | |
| download | Qt-41fbe7440778f36afe85608d1198c96de387148f.zip Qt-41fbe7440778f36afe85608d1198c96de387148f.tar.gz Qt-41fbe7440778f36afe85608d1198c96de387148f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove superfluous forward declaration.
Update documentation for the -font command line option
Fixed a crash when creating QGtkStyle before QApplication
Added support for Indonesian language on Symbian.
Ensure that activation object has been created before popping scope of native context
Diffstat (limited to 'src/opengl/util/glsl_to_include.sh')
0 files changed, 0 insertions, 0 deletions