diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 12:10:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-20 12:10:06 (GMT) |
| commit | 0fd2c492ee2e8317a5fbb0fb446816df53d5b17b (patch) | |
| tree | 0e2cb6a5a264b95ba5f38a0c279f730cb1fcbdc7 /examples | |
| parent | 7f11c900e9184565321c09533b468abb047129b8 (diff) | |
| parent | 6c8dcd5744e2c14d122f0967de72a9e171dd9715 (diff) | |
| download | Qt-0fd2c492ee2e8317a5fbb0fb446816df53d5b17b.zip Qt-0fd2c492ee2e8317a5fbb0fb446816df53d5b17b.tar.gz Qt-0fd2c492ee2e8317a5fbb0fb446816df53d5b17b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).
Support multisampled pbuffers under Windows.
tst_qpixmapfilter: Fix compilation in namespace
qtextcodec_symbian: Add few aliases
Give a warning in QPixmap::handle() if pixmap is not X11 class.
Make QStaticText honor QPainter::pen() for rich text on X11 w/raster
Fixed compilation of MeeGo graphics system without eglext.h
Fixed memory corruption issue in qt_blurImage for Indexed8 images.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/opengl/pbuffers/glwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/opengl/pbuffers/glwidget.cpp b/examples/opengl/pbuffers/glwidget.cpp index 6f4f060..c57a510 100644 --- a/examples/opengl/pbuffers/glwidget.cpp +++ b/examples/opengl/pbuffers/glwidget.cpp @@ -62,7 +62,9 @@ GLWidget::GLWidget(QWidget *parent) , cube(0) { // create the pbuffer - pbuffer = new QGLPixelBuffer(QSize(512, 512), format(), this); + QGLFormat pbufferFormat = format(); + pbufferFormat.setSampleBuffers(false); + pbuffer = new QGLPixelBuffer(QSize(512, 512), pbufferFormat, this); setWindowTitle(tr("OpenGL pbuffers")); initializeGeometry(); } |