diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 13:21:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 13:21:35 (GMT) |
| commit | 35988b6d5d14388004a4b51df1355d3d3a97d145 (patch) | |
| tree | 5d5ecbabeb3816ef8085791b2d3ac79c03dc6ca3 /src/opengl/qglshaderprogram.cpp | |
| parent | 6f3ca5bd871fa678549916d8649e779ca20770fa (diff) | |
| parent | c88e93ef075dcc3d10e37500bac170b3cfe8f0b1 (diff) | |
| download | Qt-35988b6d5d14388004a4b51df1355d3d3a97d145.zip Qt-35988b6d5d14388004a4b51df1355d3d3a97d145.tar.gz Qt-35988b6d5d14388004a4b51df1355d3d3a97d145.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QFileDialog: Compilation fix on windows
Add Q_MOVABLE_TYPE decls to QVector?D, QMatrix4x4, QQuaternion
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions