summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix elision and multilength strings when resizing a Text element.Michael Brasser2010-02-041-1/+10
| | | | | | They were incorrectly wrapping when the width changed. Task-number: QTBUG-7477
* Support animating attached properties.Michael Brasser2010-02-011-1/+1
| | | | Task-number: QTBUG-5580
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-01239-5147/+7409
|\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/qmlpixmapcache.cpp
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2010-01-2910-143/+451
| |\ | | | | | | | | | into kinetic-declarativeui
| | * Add new files.Martin Jones2010-01-292-0/+163
| | |
| | * Move image network access into a separate thread, with decoding.Martin Jones2010-01-296-136/+279
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-01-29110-1452/+2694
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Doc.Michael Brasser2010-01-291-2/+4
| | | |
| | * | Don't crash when accessing index -1Martin Jones2010-01-291-5/+5
| | | |
| * | | Add paintedWidth and paintedHeight properties to QmlGraphicsImage.Yann Bodson2010-01-293-2/+59
| | |/ | |/|
| * | Convert lists to variants on assignment.Aaron Kennedy2010-01-283-6/+32
| | | | | | | | | | | | QTBUG-5675
| * | Optimization: Skip attached property search where possibleAaron Kennedy2010-01-283-17/+22
| | | | | | | | | | | | QTBUG-6734
| * | Support builtin string converters in every contextAaron Kennedy2010-01-284-32/+83
| | | | | | | | | | | | QTBUG-6919
| * | Assigning undefined resets QObject propertiesAaron Kennedy2010-01-282-5/+15
| | |
| * | Add reset methods to QmlMetaPropertyAaron Kennedy2010-01-282-0/+27
| | |
| * | Cache reset'abilityAaron Kennedy2010-01-282-9/+12
| | |
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-2791-967/+2187
| |\ \ | | | | | | | | | | | | into kinetic-declarativeui
| | * | Speed up QmlGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We avoid unnecessary QVariant constructions / notifications / virtual function calls by calling the QGraphicsItemPrivate::setParentItemHelper directly. Reviewed-by: Aaron Kennedy
| | * | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-2787-891/+2079
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-2728-523/+768
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits) Compile with no-webkit - add missing semi-colons. Fixes visibility update missing when doing setParentItem on graphicsitem Stabilize tst_QGraphicsScene::polishItems2 (new test) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor ...
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-2628-523/+768
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: (32 commits) Fixes visibility update missing when doing setParentItem on graphicsitem Stabilize tst_QGraphicsScene::polishItems2 (new test) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required ...
| | | | | * Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-263-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setParentItem is causing the previous opacity/visible updates to be discarded because the dirty flags were not propagated to the new parent. Also removed some unnecessary 'markDirty' and 'update' calls. Task-number: QTBUG-6738 Reviewed-by: bnilsen
| | | | | * Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7530 Reviewed-by: Kim
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2527-488/+728
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits) Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. ...
| | | | | | * Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | * Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-252-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid traversing the whole child hierarchy when opacity changes unless there are children with graphics effects. Reviewed-by: Bjørn Erik Nilsen
| | | | | | * Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-252-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to invalidate the graphics source pixmap cache for both child items and parent items when changing the opacity of a graphics item. Reviewed-by: Bjørn Erik Nilsen
| | | | | | * Small optimization in raster paint engine.Samuel Rødal2010-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't repeatedly update the pen / brush if no pen / brush is set. Reviewed-by: Gunnar Sletta
| | | | | | * Another ASSERT while deleting spansGabriel de Dietrich2010-01-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That rare case when we are deleting the last span was not being taken care of. Unbelievable but true. Auto-test included. Reviewed-by: Thierry Reviewed-by: leo Task-number: QTBUG-6004
| | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2524-481/+666
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits) Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper Improve performance of QGraphicsItem::setParentItem. Make sure cursor is painted at the correct position when we are using IM. Purely cosmetic (formatting) changes to GL2 engine's GLSL Use an attribute value for the PMV matrix rather than a uniform Remove unnecessary depth uniform from GL2 engine's GLSL ...
| | | | | | | * Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-222-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a very operation in DirectFB and saves a fair bit of overhead. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | | | | * Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-222-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were processed immediately, so there was a fair chance that we could end up doing a virtual function call on items that were not fully constructed. This patch is also an optimization, since we never remove anything from the vector. Auto-test included. Reviewed-by: Jan-Arve
| | | | | | | * QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-223-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem occured when doing something in the polishEvent() which eventually ended up as an update(). The problem was that in QGraphicsScene::addItem we scheduled a polish event after scheduling an update, resulting in update requests being processed before polish requests. Auto-test included. Task-number: QTBUG-6956 Reviewed-by: alexis
| | | | | | | * Fix QPainter::redirection() to pass autotest.Gunnar Sletta2010-01-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | | | | | * Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.Trond Kjernåsen2010-01-221-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modal Mac/Carbon dialogs do not have the close, minimize and resize window title buttons enabled, which makes it very hard to close modal dialogs. Task-number: QTBUG-7481 Reviewed-by: Kim
| | | | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-222-2/+3
| | | | | | | |\
| | | | | | | | * Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to bind the PMV matrix's attributes to their indexes in the simple shader, which is created in a seperate code path to all the other shaders. This should fix the qgl autotest failures. Reviewed-By: TrustMe
| | | | | | | | * removed a debug traceThierry Bastian2010-01-221-2/+0
| | | | | | | | |
| | | | | | | * | Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-221-9/+5
| | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a lot of code depending on that pixmaps are flipped upside down in the gl graphicssystem, so toggling this requires extensive testing. Since we're anyway questioning the relevance of this feature (compared to raster + GL viewport) its simply not worth the effort to fix it properly right now. Revert "Fixed y-inverted pixmaps on N900." This reverts commit 57473d5d2a7bd6ae3117f61ff29264a1b790bb01.
| | | | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-2258-575/+872
| | | | | | | |\
| | | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2216-439/+541
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper Improve performance of QGraphicsItem::setParentItem. Make sure cursor is painted at the correct position when we are using IM. Purely cosmetic (formatting) changes to GL2 engine's GLSL Use an attribute value for the PMV matrix rather than a uniform Remove unnecessary depth uniform from GL2 engine's GLSL Doc fixes: Remove some lies from QEasingCurve. Fix how we select antialiasing method for text under Mac OS X
| | | | | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2116-439/+541
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper Improve performance of QGraphicsItem::setParentItem. Make sure cursor is painted at the correct position when we are using IM. Purely cosmetic (formatting) changes to GL2 engine's GLSL Use an attribute value for the PMV matrix rather than a uniform Remove unnecessary depth uniform from GL2 engine's GLSL Doc fixes: Remove some lies from QEasingCurve. Fix how we select antialiasing method for text under Mac OS X
| | | | | | | | | | * Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.Bjørn Erik Nilsen2010-01-213-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlGraphicsItem doesn't need any parent change notifactions so we can call the helper class (QGraphicsItemPrivate::setParentItemHelper) direclty from QmlGraphicsItem::setParentItem. This avoids a lot of unnecessary instructions related to QVariant constructions as well as virtual function calls. I've made the variant pointers explicit in the declaration of setParentItemHelper so that we don't accidentally call setParentItemHelper from places where we need parent change notifications. Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | | | | | | | * Pass value as const void *const to QGraphicsSceneIndex::itemChange.Bjørn Erik Nilsen2010-01-215-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this change in order to bypass some of the QVariant itemChange notifications from QGraphicsItem::setParentItem. All this is internal stuff and we know what we do, so I don't consider the change too ugly. Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | | | | | | | * Optimize QGraphicsItem::setFlags.Bjørn Erik Nilsen2010-01-211-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have to do a full blown QGraphicsItem::setFlag call from QGraphicsItem::setFlags, only to change the ItemStacksBehindParent bits. We can do it directly (with care). Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | | | | | | | * Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helperBjørn Erik Nilsen2010-01-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we do cheap tests before the more expensive ones. This function is called from QGraphicsScene::addItem. Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | | | | | | | * Improve performance of QGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-213-35/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The biggest optimization here is "updateAncestorFlags()". It's much faster to update all the flags rather than trying to enable/disable certain flags according to the current state. Task-number: QTBUG-6877 Reviewed-by: alexis
| | | | | | | | | | * Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-212-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the line edit was refactored into a line control this regression was introduced. This regression was introduced by change fb7d86cf23227302d48db279ec589221d11a1f6a. Task-number: QTBUG-4789 Reviewed-by: Alan Alpert
| | | | | | | | | | * Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-211-333/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes GLSL dumps _significantly_ easier to read. Reviewed-By: TrustMe
| | | | | | | | | | * Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-215-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has several advantages: First, updating an attribute value seems to be cheaper than updating a uniform. Second, vertex atribute values are independent of shader program, which means they persist across changing of the shader program. This makes code simpler and reduces GL state changes. Note: Credit goes to Samuel for finding this little gem. :-) For the 25920 solid QGraphicsRectItem test case, this gives 10% improvement on desktop and 27% on the SGX. Reviewed-By: Kim
generated by cgit v0.12 at 2025-01-24 07:58:54 (GMT)