diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-26 20:05:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-26 20:05:55 (GMT) |
| commit | f54d9e2ea84c59b7767696a64e9f02e0ad940275 (patch) | |
| tree | 633becfb804531dec0c2c06412205ad6a1c69de5 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | c0f415bdea15c7382800829bd5f5683aa7cd99ec (diff) | |
| parent | 2ccf2a09653d25c87e9a50dc842d2aff54fa914c (diff) | |
| download | Qt-f54d9e2ea84c59b7767696a64e9f02e0ad940275.zip Qt-f54d9e2ea84c59b7767696a64e9f02e0ad940275.tar.gz Qt-f54d9e2ea84c59b7767696a64e9f02e0ad940275.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Always prepend drive letter to $$EPOCROOT in Windows Symbian builds
Add files deployed using qmake_emulator_deployment.flm to 'what' list
QRuntimeWindowSystem: Track window size properly
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions