diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 09:03:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 09:03:25 (GMT) |
| commit | e5aa5a9d7e97b975316b8cc18554743cccf06474 (patch) | |
| tree | 10ce08f34b15e632543bed91634b7e9799d982b2 | |
| parent | 76680eff3fbbdaace80bdb89f68e678c4c99e492 (diff) | |
| parent | 3c2dc7f652996d1f3b504b42d872734df2e9234f (diff) | |
| download | Qt-e5aa5a9d7e97b975316b8cc18554743cccf06474.zip Qt-e5aa5a9d7e97b975316b8cc18554743cccf06474.tar.gz Qt-e5aa5a9d7e97b975316b8cc18554743cccf06474.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
WGL_COLOR_BITS_ARB should not take the alpha bits into account.
| -rw-r--r-- | src/opengl/qgl_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp index ed4814f..55f224a 100644 --- a/src/opengl/qgl_win.cpp +++ b/src/opengl/qgl_win.cpp @@ -920,7 +920,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; iAttributes[i++] = TRUE; iAttributes[i++] = WGL_COLOR_BITS_ARB; - iAttributes[i++] = 32; + iAttributes[i++] = 24; iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; iAttributes[i++] = d->glFormat.doubleBuffer(); if (d->glFormat.stereo()) { |