diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-08 04:36:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-08 04:36:17 (GMT) |
| commit | dfd7c876263310c03d8b64033749efe2b6b1e081 (patch) | |
| tree | bd71f8e8697ac38954476804d329c46f69cb8545 /src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | |
| parent | 7d92a635bc21ae64071854f460098deeceb6c199 (diff) | |
| parent | 2350298a3ba43a61f2e88bbd85c38b046269c6b5 (diff) | |
| download | Qt-dfd7c876263310c03d8b64033749efe2b6b1e081.zip Qt-dfd7c876263310c03d8b64033749efe2b6b1e081.tar.gz Qt-dfd7c876263310c03d8b64033749efe2b6b1e081.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Disabled tst_MakeTestSelfTest::make_check by default on mac.
Diffstat (limited to 'src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp')
0 files changed, 0 insertions, 0 deletions