summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed crash in Lance under Mac OS X without graphics systemGunnar Sletta2009-10-201-1/+6
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-graphics-teamGunnar Sletta2009-10-2020-81/+1186
|\
| * Use different GL contexts for ARGB & RGB pixmapsTom Cooksey2009-10-191-31/+100
| * Add an assert testing the cleanup hooks exist before executing themTom Cooksey2009-10-191-0/+1
| * Add a new QX11GLPixmapData which renders to X pixmaps using GLTom Cooksey2009-10-199-5/+304
| * Separate modification & destruction pixmap cleanup hooksTom Cooksey2009-10-195-19/+67
| * Stop QEglContext destroying contexts it doesn't ownTom Cooksey2009-10-192-2/+4
| * Integrated new triangulating stroker into QtGunnar Sletta2009-10-195-54/+730
| * Fixed slow QPixmap::fill() when the pixmap is sharing data.Kim Motoyoshi Kalland2009-10-191-1/+11
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-10-193-12/+51
|\ \
| * \ Merge branch '4.6'Thiago Macieira2009-10-1959-1402/+1634
| |\ \
| | * | Made Mac Carbon use the input method hints when deciding on IM.axis2009-10-191-1/+5
| | * | Fix autotest case for QSoftkeyManagerSami Merilä2009-10-191-10/+46
| | * | Remove debug output.Morten Johan Sørvig2009-10-191-1/+0
| | |/
* | | Merge branch '4.6' of ..\qt-graphics-4.6Gunnar Sletta2009-10-1956-1390/+1583
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-191-0/+25
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Peter Yard2009-10-191-1/+1
| | |\
| | * | Additional documentation added to deployment.qdoc which lists the process and...Peter Yard2009-10-191-0/+25
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-19433-33829/+43712
| |\ \ \ | | | |/ | | |/|
| | * | ODBC: Retrieved in ascii, should be stored in ascii.Bill King2009-10-191-1/+1
| | |/
| * | Fixed crash in the Boxes demo when using -graphicssystem opengl.Kim Motoyoshi Kalland2009-10-161-0/+6
| * | This reverts commit 99739f35bf700a2bff707da99f5043cd7c12aed5.Kim Motoyoshi Kalland2009-10-161-3/+4
| * | Fixed a crash in tst_qpainter on SPARC w/gcc.Trond Kjernåsen2009-10-161-2/+2
| * | Fixed a crash in the tst_qgl test.Trond Kjernåsen2009-10-161-1/+2
| * | Optimized QPixmap::fill for GL backend when pixmap is used as is.Samuel Rødal2009-10-152-25/+43
| * | Fixed tst_QPixmap test failures with GL pixmap backend.Samuel Rødal2009-10-151-0/+4
| * | Fixed QPainter::begin() so that it fails gracefully.Kim Motoyoshi Kalland2009-10-153-29/+75
| * | Added explicit qualification of static functions to fix xlC compilation.Samuel Rødal2009-10-151-3/+3
| * | Optimized raster drop shadow filter to only blur alpha channel.Samuel Rødal2009-10-151-24/+27
| * | Fixed buggy bitmap drawing in GL 2 engine on X11.Samuel Rødal2009-10-151-1/+1
| * | Fixed bitmap brushes and tiled bitmaps in the OpenGL1 paint engine.Kim Motoyoshi Kalland2009-10-153-92/+132
| * | CompileEskil Abrahamsen Blomfeldt2009-10-151-1/+1
| * | Fixed the GLSL-to-assembly code generator to output enums correctly.Kim Motoyoshi Kalland2009-10-141-21/+32
| * | Cleaned up OpenGL1 paint engine GLSL code.Kim Motoyoshi Kalland2009-10-1420-1063/+1009
| * | Optimized bloom graphics effect implementation.Samuel Rødal2009-10-141-9/+13
| * | Added qt_toRasterPixmap functions.Samuel Rødal2009-10-141-0/+23
| * | Added QPixmapData::createCompatiblePixmapData() used by QPixmap::copy().Samuel Rødal2009-10-1413-8/+52
| * | Fixed wrong use of graphics effects for pixmap graphics items.Samuel Rødal2009-10-141-27/+7
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-146-17/+16
| |\ \
| | * | Fixed upside down brush patterns in the OpenGL paint engines.Kim Motoyoshi Kalland2009-10-142-3/+0
| | * | Fixed handling of brush origin in the OpenGL paint engines.Kim Motoyoshi Kalland2009-10-133-14/+14
| | * | Fixed bug where bitmaps were painted black instead of in pen colour.Kim Motoyoshi Kalland2009-10-131-0/+2
| * | | updated fragment programs after changes to .glsl filesGunnar Sletta2009-10-141-141/+105
| * | | Make QStrokerOps, QStroker and QDashStroker properly modulargunnar2009-10-131-4/+4
| * | | Make QStrokerOps, QStroker and QDashStroker properly modulargunnar2009-10-132-8/+38
| |/ /
| * | Work around broken ATI X1600 drivers on Mac OS XGunnar Sletta2009-10-131-1/+19
| * | Fixed bug when using QGLWidgets in -graphicssystem openglSamuel Rødal2009-10-122-1/+18
| * | Fixed documentation of QPixmap::x11Info() to not talk about widgets.Samuel Rødal2009-10-121-5/+5
| * | Fixed bug on X11 with WA_TranslucentBackground and native child widgets.Samuel Rødal2009-10-121-25/+46
| * | Fixed bug where calling fill on pixmap with active painter would crash.Kim Motoyoshi Kalland2009-10-091-0/+10