diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 16:58:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-26 16:58:16 (GMT) |
| commit | 73979fe4e47a873e2075e60e58c6b54ee6992c38 (patch) | |
| tree | d5d35fbb1c5b93470b6b1aa03c359ac09695055f /src/corelib/tools/qtimeline.h | |
| parent | 065610d14fda00057724a46e2649db6bb98aca58 (diff) | |
| parent | 69354f37173b7bfcf7ea0f37175a34b8766afcbb (diff) | |
| download | Qt-73979fe4e47a873e2075e60e58c6b54ee6992c38.zip Qt-73979fe4e47a873e2075e60e58c6b54ee6992c38.tar.gz Qt-73979fe4e47a873e2075e60e58c6b54ee6992c38.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
WGL_COLOR_BITS_ARB should not take the alpha bits into account.
Fix the broken unicode detection of ODBC driver.
QNAM HTTP: Prepare a compression auto test related to a future bugfix
fix Norwegian Breakfast Network warnings in configure
fix shadow build of configure.exe
fix epic fail from 4ba6646
qmake: fix assertion on Windows when DESTDIR is empty in static libs
Fix OpenGLVersionFlags on OpenGL 4.0 systems
Update changes-4.6.4 with recent shader program changes
Don't define highp/mediump/lowp if desktop GL has them
QNAM HTTP: Fix crash related to aborted uploads
QAudioOutput(ALSA); Fix check for available devices.
Diffstat (limited to 'src/corelib/tools/qtimeline.h')
0 files changed, 0 insertions, 0 deletions