summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make sure we don't create pixmaps that are bigger than the device rect.Bjørn Erik Nilsen2009-07-305-2/+41
|
* Prevent potential QGraphicsEffect crashes.Bjørn Erik Nilsen2009-07-301-10/+17
|
* Small optimization to QGraphicsEffectSource::boundingRect.Bjørn Erik Nilsen2009-07-291-1/+2
| | | | | Don't bother asking for the childrenBoundingRect if the item has no children.
* A few QGraphicsEffect optimizations.Bjørn Erik Nilsen2009-07-291-7/+20
| | | | | | | First of all we shouldn't pass pixmap.rect() into the filter, we always want to draw the entire pixmap (without making a copy). We can also skip the filter entirely if the filter is effectively not doing anything.
* QGraphicsShaderEffect doesn't need to be a metatype any moreRhys Weatherley2009-07-291-2/+0
| | | | Reviewed-by: trustme
* Merge branch 'kinetic-graphicseffect' of ↵Bjørn Erik Nilsen2009-07-293-7/+7
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects
| * Fixed various valgrind-reported issues in GL 2 engine.Samuel Rødal2009-07-293-7/+7
| |
* | Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0eddBjørn Erik Nilsen2009-07-293-23/+17
| | | | | | | | Makes QGraphicsShaderEffect compatible with the new QGraphicsEffect API.
* | Merge branch 'kinetic-graphicseffect' of ↵Bjørn Erik Nilsen2009-07-29245-2336/+5476
|\ \ | |/ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects Conflicts: src/gui/graphicsview/qgraphicseffect.cpp src/gui/graphicsview/qgraphicseffect_p.h
| * Improve GL filter performance by caching custom shader programs.Samuel Rødal2009-07-282-10/+19
| | | | | | | | This brings performance back up to where it was pre-merge.
| * Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffectSamuel Rødal2009-07-2813-337/+698
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qglengineshadermanager.cpp src/opengl/gl2paintengineex/qglengineshadermanager_p.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h Merge custom shader / GL blur pixmap filter implementation from graphics team repo with implementation from kinetic graphics-team repo.
| | * 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
| | | | | | | | | | | | | | | The FBO pool will be useful in other places as well, plus it makes it easier to deal with graphics memory management issues.
| | * Added caching of custom shader programs as well in GL 2 shader manager.Samuel Rødal2009-07-012-15/+32
| | | | | | | | | | | | | | | Ensures that the programs are evicted from the cache when the shaders are destroyed.
| | * Added QPixmapBlurFilter with GL implementation.Samuel Rødal2009-06-303-1/+463
| | | | | | | | | | | | | | | No raster engine based fallback so far... Also, performance is lacking since the QGLShaderProgram isn't cached.
| | * 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
| | | | | | | | | | | | Works just like drawImage / drawPixmap but uses the given texture id.
| | * Added custom shader hook to the GL 2 paint engine.Samuel Rødal2009-06-305-24/+107
| | | | | | | | | | | | | | | This will make it easier to implement pixmap filters, YUV->RGB conversions, etc in other parts of Qt.
| * | Update QGraphicsShaderEffect to match new APIRhys Weatherley2009-07-249-62/+61
| | |
| * | Merge branch 'kinetic-graphicseffect' of ↵Rhys Weatherley2009-07-2417-477/+488
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-graphicseffect
| * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| | * | | 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
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Trustme
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 34fde4a4 removes one bit from the flags bitfield, which was added in change 7bc98d7b. This happened during resolving of a merge conflict and caused some input method related autotests in tst_QGraphicsView to fail. Reviewed-by: mbm
| | | * | | Add QGraphicsItem::focusProxy(), focus proxy support.Andreas Aardal Hanssen2009-07-236-48/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following QWidget's behavior, you can not assign any item in the same scene as a focus proxy for another item. Also supports nested focus proxies. You can only assign items in the same scene as focus proxies. Autotests are included. Reviewed-By: mbm
| | | * | | Add texture_from_pixmap defines for systems without themTom Cooksey2009-07-231-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the build on older Solaris machines which don't have the GLX_EXT_texture_from_pixmap defines in glxext.h. Reviewed-By: Trustme
| | * | | | Build with rvct compiler.Martin Jones2009-07-232-2/+3
| | |/ / / | | | | | | | | | | | | | | | Reviewed-by: akennedy
| | * | | Add the math3d types to QVariantRhys Weatherley2009-07-2315-28/+452
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * | | Compile in release mode for DFB version > 0.9Anders Bakken2009-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Something went wrong with the integrate from 4.5 to master. Reviewed-by: TrustMe
| | * | | CompileAnders Bakken2009-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dummy implementaion of QReadWriteLock wasn't source compatible with the real implementation and this lead to compilation errors in qabstractfileengine.cpp which now has a global static QReadWriteLock that takes a Recursive argument. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
| | * | | Doc - Clarified that Graphics View does not support the inverted y-axisKavindra Devi Palaraja2009-07-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | coordinate system Task: 258259 Reviewed-By: João Abecasis <joao@trolltech.com>
| | * | | Fix potential deadlock in QAbstractFileEngineJoão Abecasis2009-07-221-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a possibility for deadlocking with user code in QAbstractFileEngine. Changing the QMutex there to a QReadWriteLock should reduce the possibilities for this happening. Also reduced the scope of the lock in QAbstractFileEngine. Reviewed-by: Thiago Macieira
| | * | | Fix build on MacTom Cooksey2009-07-222-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The texture_from_pixmap patch removed a bindTexture overload from QGLContextPrivate which is actually needed by all architectures. It was just it's use in the mac compat methods which broke the build and highlighted the issue. Reviewed-By: Trustme
| | * | | Plug a texture leak when deleting QPixmaps without a current contextTom Cooksey2009-07-222-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~QGLTexture wouldn't make the texture's context current if the current context was zero, meaning the texture would leak. This also means deleteBoundPixmap doesn't need to make the context currnet anymore (as it's only called from ~QGLTexture). Reviewed-By: Kim
| | * | | Fix autotest compile failureJens Bache-Wiig2009-07-221-2/+2
| | | | |
| | * | | fix linker error for the cetest toolJoerg Bornemann2009-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | QNetworkReply: add possibility to ignore specific SSL errorsPeter Hartmann2009-07-2221-17/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same method was also added to QSslSocket. previously, it was only possible to ignore all SSL errors; now, it is also possible to only ignore specific SSL errors, given by a QList of QSslErrors. Moreover, it is possible to call this newly added method right after connecting, not just when we get the SSL error. Reviewed-by: Thiago Task-number: 257322
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had this #ifdef __OPTIMIZE__ there so that the compiler would know not to generate unnecessary calls and a long jump table for the switch of the marshalling code. Turns out that in release mode, the checks I added to make sure we detect invalid object paths and signatures were never hit (we always treated them as pure strings). So use the signature- and object path-checking code in both release and debug mode. Task-number: reported via email (tst_qdbusmarshall failing) Reviewed-by: Peter Hartmann
| | | * | | Revert "Added a check that X11 timestamp goes forward only."Denis Dzyubenko2009-07-221-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases we might get an invalid timestamp that is far away in the future, so remembering it will break all consequent X calls that require a timestamp because it just contains junk (for example clipboard will stop working). This happens with XIM+SCIM pair - whenever we start input method and type something to the widget, we get a XKeyPress event with a commited string, however the 'serial' and 'time' members of the XEvent structure are not initialized (according to valgrind) and contain junk. This reverts commit 2ed015b8a0ffad63f0f59b0e2255057f416895fb. Reviewed-By: Brad
| | | * | | QSslSocket autotest: adapt to new certificate on test serverPeter Hartmann2009-07-222-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | got a new certificate, which is self-signed now Reviewed-by: Thiago
generated by cgit v0.12 at 2024-11-11 05:09:29 (GMT)