diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 10:55:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 10:55:53 (GMT) |
| commit | dfe0fe190d078ee5b946cfba01734c34cc5cd3ec (patch) | |
| tree | 0ab36c17eae6bf26c307700eb4f1ca48072f2bdd /src | |
| parent | 55e787106e925eea89968bf9f91f063de8bbef98 (diff) | |
| parent | 3676380190908d79fe547cf2a5efc3efdba25af8 (diff) | |
| download | Qt-dfe0fe190d078ee5b946cfba01734c34cc5cd3ec.zip Qt-dfe0fe190d078ee5b946cfba01734c34cc5cd3ec.tar.gz Qt-dfe0fe190d078ee5b946cfba01734c34cc5cd3ec.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:
Allow QGLWidgets to draw them selves under -graphicssystem raster again...
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 0282c79..8576f52 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -549,8 +549,11 @@ static int qCocoaViewCount = 0; qwidgetprivate->syncBackingStore(qwidget->rect()); } - // Since we don't want to use the native engine, we must exit. - return; + // Since we don't want to use the native engine, we must exit, however + // widgets that are set to paint on screen, spesifically QGLWidget, + // requires the following code to execute in order to be drawn. + if (!qwidget->testAttribute(Qt::WA_PaintOnScreen)) + return; } CGContextRef cg = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; |