summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-10-06198-720/+2342
|\
| * Optimized restore() in GL 2 paint engine.Samuel Rødal2009-10-062-19/+46
| * Merge branch 'stencil-clipping' into 4.6Samuel Rødal2009-10-062-201/+261
| |\
| | * Changed GL 2 engine render text implementation to use glDepthRange().Samuel Rødal2009-10-062-16/+30
| | * Made depth tested renderText() work after stencil clipping change.Samuel Rødal2009-10-061-7/+10
| | * Added convex polygon optimization to QGL2PaintEngineExPrivate::fill().Samuel Rødal2009-10-061-5/+4
| | * Switched to using stencil instead of depth buffer for clipping.Samuel Rødal2009-10-062-121/+173
| | * Moved GL 2 clip clearing code into a common function.Samuel Rødal2009-10-062-14/+15
| | * Got rid of some redundant state changes regarding GL depth state.Samuel Rødal2009-10-061-14/+9
| | * Renamed GL 2 engine variables to be clip buffer agnostic.Samuel Rødal2009-10-062-52/+52
| | * Switched to using GL_LEQUAL instead of GL_LESS in GL 2 engine.Samuel Rødal2009-10-061-10/+11
| | * Made GL 2 paint engine waste less bits in clipping algorithm.Samuel Rødal2009-10-061-5/+4
| | * Refactored GL 2 engine UniteClip to always increase max depth.Samuel Rødal2009-10-061-3/+2
| | * Moved maxDepth out of state object and got rid of unused state members.Samuel Rødal2009-10-062-14/+9
| | * Fixed missing stencil buffer clear when scissor testing is disabled.Samuel Rødal2009-10-061-1/+3
| * | QScriptContext::parentContext: don't skip unessecary framesOlivier Goffart2009-10-062-2/+1
| * | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-06361-2254/+4707
| |\ \
| | * | Removed ICON for apps and demos except fluidlauncher and desktopservicesEspen Riskedal2009-10-063-31/+2
| | * | Better compile fix.Alexis Menard2009-10-061-1/+1
| | * | tst_qnetworkreply: httpConnectionCount test improvementsMarkus Goetz2009-10-061-3/+7
| | * | Build fix.Alexis Menard2009-10-061-1/+1
| | * | add test for QT-2270Kent Hansen2009-10-061-0/+17
| | * | Needed to set ENABLE_YARR_JIT to not compile MacroAssembler.cppJørgen Lind2009-10-062-4/+16
| | * | tst_qhttpnetworkconnection: Some more checksMarkus Goetz2009-10-061-2/+14
| | * | Fixing the compile bug for Symbian when using ARMV5Aleksandar Sasha Babic2009-10-062-0/+5
| | |/
| | * add missing includeKent Hansen2009-10-061-0/+1
| | * Fixed some projective transform rendering bugs on qreal=float platforms.Samuel Rødal2009-10-061-1/+1
| | * Fixed bug in GL 2 engine when using beginNativePainting.Samuel Rødal2009-10-061-0/+2
| | * compile without QT3SUPPORTJoerg Bornemann2009-10-061-0/+2
| | * QAbstractSocket::setSocketOption: Make const referenceMarkus Goetz2009-10-062-3/+3
| | * Merge commit 'origin/4.5' into 4.6Joerg Bornemann2009-10-062-0/+3
| | |\
| | | * tst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect WinCE fixJoerg Bornemann2009-10-061-1/+1
| | | * tst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fixJoerg Bornemann2009-10-061-0/+1
| | | * tst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobileJoerg Bornemann2009-10-061-0/+2
| | * | tst_qnetworkreply: Add ioPostToHttpsUploadProgressMarkus Goetz2009-10-063-0/+143
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6ninerider2009-10-0645-300/+1551
| | |\ \
| | | * | Fix crash in QPlainTextEdit when using large fontsEskil Abrahamsen Blomfeldt2009-10-061-0/+3
| | | * | Span update after row and column insertion and removal in QTableView.Gabriel de Dietrich2009-10-065-4/+792
| | | * | Small doclet fixThomas Zander2009-10-061-3/+3
| | | * | Fixed an assert occuring on X11 when destroying QPixmaps under GL.Trond Kjernåsen2009-10-061-2/+4
| | | * | Corrected Qt logo colors.Alessandro Portale2009-10-061-7/+7
| | | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-06316-1921/+3227
| | | |\ \
| | | | * | QParallelAnimationGroup: set the correct state for the animationsThierry Bastian2009-10-063-30/+194
| | | | * | The threshold for system basic timers has changed on windowsThierry Bastian2009-10-062-3/+7
| | | | * | Optimized window surfaces on X11 by not setting clip in the common case.Samuel Rødal2009-10-062-5/+13
| | | | * | doc: Fixed a qdoc command that was meant to add emphasisThorbjørn Lindeijer2009-10-061-1/+1
| | | | * | implement property getters&setters for setProperty(quint32) overloadKent Hansen2009-10-062-2/+31
| | | | * | Only build demo-browser 32-bit if Qt was actually built 32-bitTor Arne Vestbø2009-10-061-2/+8
| | | | * | Add support for XFCE desktop integrationJens Bache-Wiig2009-10-061-2/+7
| | | | * | Add GNOME implementation for native filesystem iconsJens Bache-Wiig2009-10-063-0/+72