Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | | | | | Stub out QtOpenGL on Lighthouse & get it compiling | Tom Cooksey | 2010-03-31 | 5 | -1/+329 | |
| | * | | | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-18 | 17 | -74/+243 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into 4.7-lighthouse | Jørgen Lind | 2010-03-11 | 19 | -627/+334 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-01 | 38 | -625/+5264 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'remotes/qt/4.6' into lighthouse | Paul Olav Tvete | 2010-02-10 | 26 | -828/+1003 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.6' into lighthouse | Paul Olav Tvete | 2010-01-14 | 69 | -1989/+2608 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | compile with Q_WS_LITE | Harald Fernengel | 2009-12-04 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | make sure that x11 is disabled when building embedded_lite | Harald Fernengel | 2009-12-04 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the correct attribute arrays are enabled in GL's glyph cache | Eskil Abrahamsen Blomfeldt | 2010-10-27 | 1 | -4/+4 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-26 | 5 | -60/+88 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-25 | 5 | -60/+88 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-23 | 5 | -60/+88 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Added support for blitting to native child widgets in GL window surface. | Samuel Rødal | 2010-10-22 | 5 | -60/+88 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-25 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed many spelling errors. | Rohan McGovern | 2010-10-25 | 2 | -2/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 11 | -52/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-22 | 6 | -11/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Functions that are externally defined to QtOpenGL needs to be imported. | Jani Hautakangas | 2010-10-21 | 6 | -11/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Major refactoring: creating a new QPixmapData subclass for live textures. | Michael Dominic K | 2010-10-21 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Fix GL_OES_element_index_uint and add GL_OES_depth24 detection. | Jani Hautakangas | 2010-10-20 | 6 | -41/+40 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.h | Tor Arne Vestbø | 2010-10-15 | 1 | -8/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-12 | 3 | -13/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Revert "Don't define highp/mediump/lowp if desktop GL has them" | Trond Kjernåsen | 2010-10-12 | 3 | -13/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | Fix text rendering in GL when using the broken-fbo-fallback | Eskil Abrahamsen Blomfeldt | 2010-10-07 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-07 | 5 | -140/+341 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-06 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Adding a threshold for partial updates. | Michael Dominic K | 2010-10-05 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Quick fix for OSX and Windows/Mingw compilation errors. | Jani Hautakangas | 2010-10-05 | 1 | -8/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Fix gcc compilation problems in QtOpenGL. Actually was typo and | Jani Hautakangas | 2010-10-04 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-04 | 4 | -134/+334 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Enable QtOpenGL vector path caching on Symbian/IVE3 | Jani Hautakangas | 2010-10-04 | 4 | -134/+334 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-01 | 5 | -20/+53 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Fix GL glyph cache with broken-fbo-fallback | Eskil Abrahamsen Blomfeldt | 2010-10-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-10-05 | 2 | -24/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Work around OpenGL driver reading arrays asyncronously | Eskil Abrahamsen Blomfeldt | 2010-10-05 | 2 | -24/+25 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7 | Rohan McGovern | 2010-10-05 | 5 | -14/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Work around an ATI driver problem with mutli-sampled pbuffers. | Trond Kjernåsen | 2010-09-28 | 1 | -11/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | | Don't disable texture_from_pixmap on GLX/X11 by default. | Trond Kjernåsen | 2010-09-27 | 2 | -7/+29 | |
| * | | | | | | | | | | | | | | | | | | | | | | Don't pretend to support single buffered EGL surfaces. | Trond Kjernåsen | 2010-09-24 | 2 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | Named anonymous struct in the OpenGL paint engine. | Kim Motoyoshi Kalland | 2010-09-24 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 4 | -27/+78 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Fallback to A8 text rendering on Mac when LCD smoothing is disabled | Aaron Kennedy | 2010-09-29 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-09-28 | 6 | -88/+92 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Minimize parameter changes on glyph cache textures | Aaron Kennedy | 2010-09-28 | 3 | -5/+32 | |
| * | | | | | | | | | | | | | | | | | | | | | | Only set maskTexture sampler uniform once | Aaron Kennedy | 2010-09-28 | 2 | -6/+13 | |
| * | | | | | | | | | | | | | | | | | | | | | | Only repopulate the glyph cache when we know something could have changed | Aaron Kennedy | 2010-09-28 | 1 | -11/+16 | |
| * | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary attribute changes | Aaron Kennedy | 2010-09-23 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | Invalidate QStaticText coord cache when texture size changes | Aaron Kennedy | 2010-09-23 | 1 | -1/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | Make texture glyph cache on OpenGL work without a paint engine | Eskil Abrahamsen Blomfeldt | 2010-09-29 | 2 | -12/+67 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 6 | -88/+92 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |