diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-17 15:36:59 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-17 15:36:59 (GMT) |
| commit | 54b20c491f7e182f6b98f65b7e9e8e68286d6109 (patch) | |
| tree | 7f17d6b2540ea226eb7d8d1b830f31f1a032316a /src/openvg | |
| parent | dcb2678f39345b66c5303e74c156654a8d13fe83 (diff) | |
| parent | 17a0a50a101fc9863d0dffd0dcb887ba68a99622 (diff) | |
| download | Qt-54b20c491f7e182f6b98f65b7e9e8e68286d6109.zip Qt-54b20c491f7e182f6b98f65b7e9e8e68286d6109.tar.gz Qt-54b20c491f7e182f6b98f65b7e9e8e68286d6109.tar.bz2 | |
Merge branch '4.6' into qt-master-from-4.6
Conflicts:
mkspecs/common/symbian/symbian.conf
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/helpviewer.cpp
Diffstat (limited to 'src/openvg')
| -rw-r--r-- | src/openvg/qwindowsurface_vgegl.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/openvg/qwindowsurface_vgegl.cpp b/src/openvg/qwindowsurface_vgegl.cpp index d92870f..9c44545 100644 --- a/src/openvg/qwindowsurface_vgegl.cpp +++ b/src/openvg/qwindowsurface_vgegl.cpp @@ -225,10 +225,6 @@ static QEglContext *createContext(QPaintDevice *device) // Create the context object and open the display. context = new QEglContext(); context->setApi(QEgl::OpenVG); - if (!context->openDisplay(device)) { - delete context; - return 0; - } // Set the swap interval for the display. QByteArray interval = qgetenv("QT_VG_SWAP_INTERVAL"); |