diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 16:04:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 16:04:57 (GMT) |
| commit | 3a6bbedcea2b5ef15077a67c58e9e59abe904014 (patch) | |
| tree | c2199f9faa005e5082e9fe419fea3b4e85e4c6e7 /src/plugins | |
| parent | 84b5bbc77045cdc267626ff86f309664283abed4 (diff) | |
| parent | 8aa9c7638080e56b124f6542699c45dfbcbba2c0 (diff) | |
| download | Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.zip Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.gz Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index 4a86082..b1a8f5f7 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -75,6 +75,8 @@ QMeeGoGraphicsSystem::~QMeeGoGraphicsSystem() QWindowSurface* QMeeGoGraphicsSystem::createWindowSurface(QWidget *widget) const { + QGLShareContextScope ctx(qt_gl_share_widget()->context()); + QMeeGoGraphicsSystem::surfaceWasCreated = true; QWindowSurface *surface = new QGLWindowSurface(widget); return surface; @@ -82,12 +84,6 @@ QWindowSurface* QMeeGoGraphicsSystem::createWindowSurface(QWidget *widget) const QPixmapData *QMeeGoGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const { - // Long story short: without this it's possible to hit an - // uninitialized paintDevice due to a Qt bug too complex to even - // explain here... not to mention fix without going crazy. - // MDK - QGLShareContextScope ctx(qt_gl_share_widget()->context()); - return new QRasterPixmapData(type); } |