diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 11:39:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 11:39:29 (GMT) |
| commit | ff605cc0a7bc23ee9b6f885be7a47c250adf7a01 (patch) | |
| tree | 1b5ca24d025d0163e388c20ad82b705dc1de2fa8 /src/gui/embedded | |
| parent | 6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a (diff) | |
| parent | 9c1ff07b427765beb71755e964b017d8258b834e (diff) | |
| download | Qt-ff605cc0a7bc23ee9b6f885be7a47c250adf7a01.zip Qt-ff605cc0a7bc23ee9b6f885be7a47c250adf7a01.tar.gz Qt-ff605cc0a7bc23ee9b6f885be7a47c250adf7a01.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:
Make bindTextureFromNativePixmap use new QEgl APIs
Move QGLWidget::setContext logic into QEgl & QGLContext
Move EGL surface type setting to new QEglProperties::setDeviceType
Replace qt_egl_add_platform_config with existing QEglProperties API
Use QEgl::display in QGLTemporaryContext so EGL is init'd only once
Remove qt_egl_setup_x11_visual
Make QGLWidget use new QEgl::getCompatibleVisualId API
Add QEglContext::configAttrib(int name) helper
Add getCompatibleVisualId to QEgl on X11
Add QEgl::defaultConfig method to select configs suitable for Qt
Make QEgl::createSurface cross-platform and add native getters
Move chooseConfig and createSurface logic to QEgl functions
Move static methods from QEglContext to QEgl namespace
Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h
Diffstat (limited to 'src/gui/embedded')
0 files changed, 0 insertions, 0 deletions