summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-241-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Adding -qpa configure switchJørgen Lind2010-06-241-2/+2
| | * | | | | | | | | | | | | | | | Renamed files from *_lite* to *_qpa*Jørgen Lind2010-06-242-1/+1
| | * | | | | | | | | | | | | | | | Say hello to Q_WS_QPA!Jørgen Lind2010-06-245-15/+15
| | * | | | | | | | | | | | | | | | Disable the all native child widgets on lighthouseJørgen Lind2010-06-231-1/+1
| | * | | | | | | | | | | | | | | | Remove dead code (QPlatformGLWidgetSurface).Bjørn Erik Nilsen2010-06-231-9/+0
| | * | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-1823-280/+651
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Added QPlatformGLContext to QPlatformWindowJørgen Lind2010-06-114-162/+18
| | * | | | | | | | | | | | | | | | | gl on openkode. QGLWidget only works for toplevel widgetsJørgen Lind2010-06-012-111/+3
| | * | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-1018-225/+358
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | ifdef fix for egl on ws_litetsenyk2010-05-054-6/+112
| | * | | | | | | | | | | | | | | | | | Use QGLPixmapData for testlite when in OpenGL modeTom Cooksey2010-04-301-1/+1
| | * | | | | | | | | | | | | | | | | | Export QGLWindowSurface so it can be used by Lighthouse pluginsTom Cooksey2010-04-301-1/+1
| | * | | | | | | | | | | | | | | | | | Add QPlatformGLWidgetSurface::filterEventTom Cooksey2010-04-292-0/+15
| | * | | | | | | | | | | | | | | | | | Add QPlatformGLWidgetSurface to GL integrtationTom Cooksey2010-04-294-28/+58
| | * | | | | | | | | | | | | | | | | | Update QGLWindowSurface to reflect geometry -> size name changeTom Cooksey2010-04-232-11/+33
| | * | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-2123-143/+381
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Make a top-level QGLWidget work once, 50% of the timeTom Cooksey2010-04-082-4/+14
| | * | | | | | | | | | | | | | | | | | | Rename qglplatformintegration_lite.h & add QGLWidget surfaceTom Cooksey2010-04-084-3/+22
| | * | | | | | | | | | | | | | | | | | | Fixup QPlatformGLContextTom Cooksey2010-04-082-3/+16
| | * | | | | | | | | | | | | | | | | | | Introduce QPlatformGLContext to enable QtOpenGL in LighthouseTom Cooksey2010-04-065-32/+136
| | * | | | | | | | | | | | | | | | | | | Stub out QtOpenGL on Lighthouse & get it compilingTom Cooksey2010-03-315-1/+329
| | * | | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-1817-74/+243
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-1119-627/+334
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-0138-625/+5264
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-1026-828/+1003
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-1469-1989/+2608
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | compile with Q_WS_LITEHarald Fernengel2009-12-041-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | make sure that x11 is disabled when building embedded_liteHarald Fernengel2009-12-041-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the correct attribute arrays are enabled in GL's glyph cacheEskil Abrahamsen Blomfeldt2010-10-271-4/+4
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-265-60/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-255-60/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-235-60/+88
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-225-60/+88
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-252-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2511-52/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-226-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Functions that are externally defined to QtOpenGL needs to be imported.Jani Hautakangas2010-10-216-11/+11
| * | | | | | | | | | | | | | | | | | | | | | | | Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-211-0/+1
| |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.Jani Hautakangas2010-10-206-41/+40
* | | | | | | | | | | | | | | | | | | | | | | | Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.hTor Arne Vestbø2010-10-151-8/+8
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-123-13/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-123-13/+3
| * | | | | | | | | | | | | | | | | | | | | | Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-075-140/+341
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-061-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Adding a threshold for partial updates.Michael Dominic K2010-10-051-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | Quick fix for OSX and Windows/Mingw compilation errors.Jani Hautakangas2010-10-051-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | Fix gcc compilation problems in QtOpenGL. Actually was typo andJani Hautakangas2010-10-041-2/+2