summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* More QFxItem cleanup.Michael Brasser2009-07-304-41/+17
|
* Fix regression introduced in classComplete -> componentComplete.Michael Brasser2009-07-291-12/+12
|
* Partially revert ef0f2901d4055bf53ac2bebb7fe2d5681900db19.Michael Brasser2009-07-293-8/+8
| | | | Accessor method for inputMethodQuery was causing crashes.
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-2915-35/+149
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-2914-32/+146
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-293-22/+27
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-298-7/+116
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Make SameGame ScalableAlan Alpert2009-07-292-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Resize your window and hit new game This may invalidate high scores.
| | | * | Fix layout sizingAlan Alpert2009-07-291-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/fx/qfxlayouts.cpp
| | * | | KeyActions::return -> KeyActions::keyReturnYann Bodson2009-07-293-3/+3
| | | |/ | | |/|
| | * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-2937-1770/+854
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-298-7/+116
| | |\ \
| | | * | Compile.Morten Sørvig2009-07-291-1/+3
| | | | | | | | | | | | | | | | | | | | Remobe another instance of for ... in use.
| | | * | Compile on 10.4Morten Sørvig2009-07-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Don't use the "for ... in" syntax. This is Objective-C 2, which is only supported on 10.5 and up.
| | | * | fix compilation without 3d supportLars Knoll2009-07-291-1/+1
| | | | |
| | | * | Ensure hover enter events are dispatched on mouse press.Andreas Aardal Hanssen2009-07-292-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ensures that mouse presses received by the scene when there are no current mouse grabbers trigger hover event delivery. This is useful when the scene only receives presses, and no mouse moves (e.g., disabling mouse tracking on the viewport, or on systems where the mouse press is the first received event). Reviewed-by: Michael Brasser
| | | * | Fix remaining autotest failures in tst_QGraphicsWidgetAndreas Aardal Hanssen2009-07-292-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change f68fed3 introduced a few regressions in the QGraphicsWidget autotests. It turned out those autotests relied on behavior that this fix "fixed". The exact bugs were 1) that setting focus on a window or a child of a window that isn't active will automatically give that item focus, despite that its window is inactive (in contrast it should just set up subfocus and give the item focus when the window is activated), and 2) that adding a window to a scene that is active did not immediately activate that window. So one fix in the test and one in QGraphicsScene. The autotests were modified so that the respective tests operate on an active scene (by assigning the scene to an active view). The change in QGraphicsScene ensures that the first window that gets added to an active scene that does not have any active windows already, automatically gets activated. Reviewed-by: Michael Brasser
| | | * | Disambiguate QGraphicsObject::children().Andreas Aardal Hanssen2009-07-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add using to prefer QObject::children() over the obsolete QGraphicsItem::children() function. Reviewed-by: Henrik Hartz
| | | * | Fixes various db2 autotest issues.Bill King2009-07-293-5/+11
| | | | |
| * | | | Some useful ffmpeg quality setttings.Warwick Allison2009-07-291-3/+3
| | |_|/ | |/| |
* | | | QFxItem cleanup.Michael Brasser2009-07-297-29/+36
| | | |
* | | | Get rid of classComplete.Michael Brasser2009-07-2921-116/+28
|/ / / | | | | | | | | | componentComplete is always what is wanted.
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-29557-176905/+6984
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | fix merge error.Lars Knoll2009-07-291-1/+1
| | | |
| * | | simplify the code.Lars Knoll2009-07-291-4/+3
| | | |
| * | | Fix graphics transform handling after latest changes.Lars Knoll2009-07-291-8/+3
| | | |
| * | | fix all examples after change to QGraphicsTransform::origin.Lars Knoll2009-07-296-10/+10
| | | |
| * | | add support for points and fix rectLars Knoll2009-07-292-21/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value bindings for rects where using integers. Use floats instead (as JS only knows about floats anyway) and make it work with both QRect and QRectF. Add valuse bindings for QPoint and QPointF.
| * | | fixes in examples and demosLars Knoll2009-07-295-11/+17
| | | | | | | | | | | | | | | | | | | | Fixed all examples and demos to work after the changes to Flipable and Rotation3D.
| * | | rewrite QFxFlipable to work with graphics transforms.Lars Knoll2009-07-292-141/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove it's builtin axis and rotation properties. At least rotation also clashes with QGraphicsObject::rotation making it a bad idea. Now Flipable is a pure two sided item, and the developer/designer will have to set up the flipping tranformation himself.
| * | | QGraphicsAxis is goneLars Knoll2009-07-292-11/+0
| | | | | | | | | | | | | | | | Also clean up a now unused method.
| * | | always set the correct point for the transform origin.Lars Knoll2009-07-291-6/+2
| | | |
| * | | make QFxItem use QGraphicsTransformLars Knoll2009-07-299-1319/+83
| | | | | | | | | | | | | | | | | | | | | | | | removed all the QFxTransform code and converted QFxItem::transform to use a QmlList instead of a QList.
| * | | rename transformOrigin to transformOriginPointLars Knoll2009-07-292-8/+1
| | | | | | | | | | | | | | | | | | | | Like this we do not clash with the transformOrigin property in QFxItem.
| * | | Remove itemBoundingRect()Lars Knoll2009-07-293-9/+1
| | | | | | | | | | | | | | | | We can simply use boundingRect() instead.
| * | | remove scenePos() as it exists in QGraphicsItem.Lars Knoll2009-07-292-10/+0
| | | |
| * | | fix after the itemParent/parentItem cleanup.Lars Knoll2009-07-291-1/+2
| | | | | | | | | | | | | | | | | | | | The fx items often call setParent() instead of setParentItem() so we can't simply remove that method.
| * | | Remove the rotation/scale properties from QFxItemLars Knoll2009-07-293-115/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is directly supported in QGraphicsItem and we should use the methods from there. The transformation handling code in QGraphicsItem needs further cleanups to get to the agreed model (using a QGraphicsTransform and only implementing rotate/scale as trivial transformations)
| * | | remove itemParent() and related.Lars Knoll2009-07-2915-85/+67
| | | | | | | | | | | | | | | | | | | | Consistently use parentItem() as it is consistent with the naming in QGraphicsItem.
| * | | fix calculator exampleLars Knoll2009-07-291-10/+10
| |/ /
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-2911-65/+246
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Fixup merge errorsAaron Kennedy2009-07-295-53/+40
| | | |
| * | | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-291-0/+73
| |\ \ \ | | | |/ | | |/|
| | * | forgot to add this file in the last commit.Lars Knoll2009-07-291-0/+73
| | | |
| * | | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-29525-175164/+6631
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/widgets/qlineedit.cpp
| | * | Implement new transformation handling for graphics items.Lars Knoll2009-07-2914-455/+998
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea of having separate rotationX/Y/Z, shearX/Y, etc. methods in QGraphicsItem turned out to be not giving us the flexibility we need and wanted. The new code now implements a different scheme, where we keep simple rotate (around z-axis), scale and transformOriginPoint methods, but remove the other ones. Instead we now have an additional list of QGraphicsTransform object. QGraphicsTransform is an abstract class that inherits QObject. Several specializations are provided and can be used to transform (and through property bindings animate) the item. Reviewed-By: Andreas
| | * | Added a QVariant testlib toString specialization.Rohan McGovern2009-07-283-2/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If comparing two variants fails, the failure message will now output the type and value of the variants (rather than "Compared values are not the same"). Reviewed-by: Thiago
| | * | Doc: Some final QMatrix cleanups.Volker Hilsheimer2009-07-284-15/+27
| | | |
| | * | Doc: Re-apply relevant change from 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2Volker Hilsheimer2009-07-281-4/+11
| | | | | | | | | | | | | | | | | | | | Clarified that the format used in QImage::fromData() is the image format, not the pixel format.
| | * | Remove a warning in qdirectfbpaintengineAnders Bakken2009-07-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | These structures are only used in versions after 0.922. Reviewed-by: Donald <qt-info@nokia.com>