diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 12:57:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 12:57:26 (GMT) |
| commit | 7d0f65a26e0c5d96d86b8404c287fb736f5ffdcd (patch) | |
| tree | 24adfa7090f4b071e53703609bace8e75d047dc7 /src/network | |
| parent | 6a6093d69e2c3af9e66b6e2c364a7f2785c88d8a (diff) | |
| parent | a140e37fab6a1d028fd1b751a98774dacb4f1a89 (diff) | |
| download | Qt-7d0f65a26e0c5d96d86b8404c287fb736f5ffdcd.zip Qt-7d0f65a26e0c5d96d86b8404c287fb736f5ffdcd.tar.gz Qt-7d0f65a26e0c5d96d86b8404c287fb736f5ffdcd.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:
Fix & move QEgl::native* to platform-specific files
Updates to changes file
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/network')
0 files changed, 0 insertions, 0 deletions