summaryrefslogtreecommitdiffstats
path: root/src/gui/egl
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-214-3/+19
|\
| * Make QEglContext::extensions() staticTom Cooksey2009-08-212-3/+3
| | | | | | | | | | | | This is private API Reviewed-By: Trustme
| * Add a static QEglProperties::dumpAllConfigs()Tom Cooksey2009-08-212-0/+16
| | | | | | | | | | | | This is private API Reviewed-By: Trustme
* | Merge commit 'qt/master'Jason Barron2009-08-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
* | Merge commit 'qt/master'Jason Barron2009-08-138-9/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * Update contact URL in license headers.Jason McDonald2009-08-128-8/+8
| | | | | | | | Reviewed-by: Trust Me
| * Make chooseConfig work on some EGL implementationsHarald Fernengel2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | According to the spec, if we pass a 0 out pointer, EGL should tell us how many configurations are available. However, we pass a 0 out pointer, but say that it's 256 elements big, it confuses some implementations. Fix that by passing a 0 out pointer and saying that it has space for 0 elements. Now we correctly get the amount of available configs. Reviewed-by: Rhys Weatherley <rhys.weatherley@nokia.com>
* | Merge commit 'qt/master-stable'Jason Barron2009-08-061-4/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * Fix build on HarmattanTom Cooksey2009-08-041-4/+7
| |
* | Merge commit 'qt/master-stable'Jason Barron2009-08-045-2/+50
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * Add EGL_BIND_TO_TEXTURE_RGBA to QEglProperties::reduceConfiguration()Tom Cooksey2009-08-031-1/+10
| | | | | | | | | | Now reduceConfiguration will add a new step of reduction which removes EGL_BIND_TO_TEXTURE_RGBA and replaces it with EGL_BIND_TO_TEXTURE_RGB.
| * Add a constructor to QEglProperties which takes an EGLConfigTom Cooksey2009-08-032-0/+15
| | | | | | | | | | The constructor then extracts all the attributes from the config. Useful for dumping all the attributes for a particular config to qDebug().
| * Make QEglProperties::setVisualFormat() read alpha for visualTom Cooksey2009-08-031-1/+11
| | | | | | | | Reviewed-by: Trustme
| * Add a getter to QEglContext for the EGL extension stringTom Cooksey2009-07-292-0/+14
| | | | | | | | Reviewed-By: Rhys Weatherley
* | Change the inclusion method here to use system includes.Jason Barron2009-07-081-1/+1
|/ | | | | | | | | This is a workaround for a bug in the Symbian toolchain where user includes are included relative to the source file instead of to the header that actually included it. Making them system includes seems to work around the issue without introducing problems on other platforms (so far?). These particular files cause problems because they are included by modules other than QtGui such as QtOpenVG and QtSVG.
* Don't refer to non-existing QVGWidget in private header comments.Rhys Weatherley2009-06-242-2/+2
| | | | Reviewed-by: trustme
* Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-229-0/+1685
This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
generated by cgit v0.12 at 2024-11-24 17:48:26 (GMT)