diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-25 17:21:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-25 17:21:24 (GMT) |
| commit | a87c7d4cb3d667694bf58ab53b3d69ce82869718 (patch) | |
| tree | 4514d66bb9db898ce8a597feef6641aa2e701b69 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | a1c15ddb82e07dae2e1ed4ae971586379cbf6649 (diff) | |
| parent | 7a0fb8407b0737d6f10181846dd49791e094fd88 (diff) | |
| download | Qt-a87c7d4cb3d667694bf58ab53b3d69ce82869718.zip Qt-a87c7d4cb3d667694bf58ab53b3d69ce82869718.tar.gz Qt-a87c7d4cb3d667694bf58ab53b3d69ce82869718.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:
FTBFS on hurd-i386 because since clock_gettime is not available there
Fix build on ARMv6 when NEON is detected.
Add two new mkspecs for SunCC with stlport.
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions