summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffectSamuel Rødal2009-07-2813-337/+698
|\
| * Further optimized the GL blur filter by caching the QGLShader.Samuel Rødal2009-07-022-4/+9
| * Fixed GL blur filter to handle painter translates and larger FBO sizes.Samuel Rødal2009-07-021-1/+17
| * Made GL blur filter use the new FBO pool for improved performance.Samuel Rødal2009-07-021-12/+16
| * Refactored the GL QPixmap backend to use an FBO pool class.Samuel Rødal2009-07-022-41/+106
| * Added caching of custom shader programs as well in GL 2 shader manager.Samuel Rødal2009-07-012-15/+32
| * Added QPixmapBlurFilter with GL implementation.Samuel Rødal2009-06-303-1/+463
| * Added missing createPixmapFilter() implementation in GL 2 engine.Samuel Rødal2009-06-302-0/+10
| * Added drawTexture function to GL 2 paint engine.Samuel Rødal2009-06-302-1/+17
| * Added custom shader hook to the GL 2 paint engine.Samuel Rødal2009-06-305-24/+107
* | Update QGraphicsShaderEffect to match new APIRhys Weatherley2009-07-249-62/+61
* | Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kineti...Rhys Weatherley2009-07-2417-477/+488
|\ \
| * | Make QGraphicsEffect independent of QGraphicsItem.Bjørn Erik Nilsen2009-07-2414-303/+297
| * | QGraphicsEffect API cleanup.Bjørn Erik Nilsen2009-07-2315-217/+234
* | | Implement a variant on blurpicker that shows a custom shader.Rhys Weatherley2009-07-2410-0/+569
* | | Reset shader stage variables when the custom shader is explicitly removed.Rhys Weatherley2009-07-241-0/+2
* | | Implement QGraphicsShaderEffect for custom shader-based effectsRhys Weatherley2009-07-243-0/+413
* | | Make it easier to change custom shaders.Rhys Weatherley2009-07-244-0/+26
* | | Make ordinary shaders work again after custom shader changes.Rhys Weatherley2009-07-241-7/+7
* | | Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shadersRhys Weatherley2009-07-23228-2006/+3769
|\ \ \ | |/ / |/| |
| * | Actually add the files... :-)Tom Cooksey2009-07-232-0/+196
| * | Initial stab at a custom shader stage APITom Cooksey2009-07-236-56/+134
| * | Fix build on HarmattanTom Cooksey2009-07-231-1/+1
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMartin Jones2009-07-237-50/+282
| |\ \
| | * | Fix merge error, restore size of bit field.Andreas Aardal Hanssen2009-07-231-2/+2
| | * | Add QGraphicsItem::focusProxy(), focus proxy support.Andreas Aardal Hanssen2009-07-236-48/+261
| | * | Add texture_from_pixmap defines for systems without themTom Cooksey2009-07-231-0/+19
| * | | Build with rvct compiler.Martin Jones2009-07-232-2/+3
| |/ /
| * | Add the math3d types to QVariantRhys Weatherley2009-07-2315-28/+452
| * | Compile in release mode for DFB version > 0.9Anders Bakken2009-07-221-1/+6
| * | CompileAnders Bakken2009-07-221-1/+2
| * | Doc - Clarified that Graphics View does not support the inverted y-axisKavindra Devi Palaraja2009-07-221-0/+3
| * | Fix potential deadlock in QAbstractFileEngineJoão Abecasis2009-07-221-10/+12
| * | Fix build on MacTom Cooksey2009-07-222-8/+28
| * | Plug a texture leak when deleting QPixmaps without a current contextTom Cooksey2009-07-222-16/+9
| * | Fix autotest compile failureJens Bache-Wiig2009-07-221-2/+2
| * | fix linker error for the cetest toolJoerg Bornemann2009-07-221-1/+2
| * | QNetworkReply: add possibility to ignore specific SSL errorsPeter Hartmann2009-07-2221-17/+348
| * | Merge branch '4.5'Thiago Macieira2009-07-225-56/+40
| |\ \
| | * | Fix handling of invalid object paths and signatures in release mode.Thiago Macieira2009-07-221-11/+2
| | * | Revert "Added a check that X11 timestamp goes forward only."Denis Dzyubenko2009-07-221-20/+15
| | * | QSslSocket autotest: adapt to new certificate on test serverPeter Hartmann2009-07-222-23/+16
| | * | Fix table borders in multiline tables when printing to PostScript.Gunnar Sletta2009-07-221-2/+7
| * | | Use texture_from_pixmap on X11 & avoid copiesTom Cooksey2009-07-228-174/+422
| * | | Compile on embeddedOlivier Goffart2009-07-222-2/+2
| * | | Make QStateMachine inherit QStateKent Hansen2009-07-2219-499/+428
| * | | Merge commit 'origin/4.5'Olivier Goffart2009-07-221-2/+4
| |\ \ \ | | |/ /
| | * | Fix memory leak.Olivier Goffart2009-07-221-0/+2
| | * | Update documentation for QMessageBox::open().Norwegian Rock Cat2009-07-221-2/+4
| * | | Prefer mutable over const_cast.João Abecasis2009-07-222-5/+4