summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-10-05240-2095/+5224
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-051-4/+6
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-0513-65/+65
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Minor fixes to flickr example.Michael Brasser2009-10-051-4/+6
| | | |
| * | | update docYann Bodson2009-10-051-13/+10
| | |/ | |/|
| * | Change .sci syntax to match BorderImage.Yann Bodson2009-10-0513-65/+65
| |/
| * Experiment with syncing GraphicsObjectContainer and QGraphicsWidget sizes.Michael Brasser2009-10-052-2/+103
| |
| * Fix Rectangle size when drawing with qDrawBorderPixmap.Michael Brasser2009-10-051-1/+1
| |
| * Fix benchmark.Michael Brasser2009-10-051-2/+2
| |
| * Update Rectangle to use qDrawBorderPixmap.Michael Brasser2009-10-051-35/+3
| |
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-059-34/+41
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Use qDrawPixmaps for particles.Michael Brasser2009-10-051-2/+16
| | |
| * | No longer need to disable JITing.Michael Brasser2009-10-041-2/+0
| | |
| * | Make compile.Michael Brasser2009-10-041-1/+1
| | |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-04218-1969/+5018
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure
| | * | Adding comments.Alessandro Portale2009-10-031-0/+9
| | | |
| | * | Doc: Document HTML and status as properties.Volker Hilsheimer2009-10-031-5/+7
| | | |
| | * | Doc: silence qdoc warnings in S60 specific documentation.Volker Hilsheimer2009-10-032-3/+4
| | | | | | | | | | | | | | | | Not sure why the migration classes should be are \obsolete.
| | * | Doc: silence more qdoc warnings.Volker Hilsheimer2009-10-035-17/+10
| | | | | | | | | | | | | | | | | | | | Mark QGraphicsAnchor::unsetSpacing as reset function of the spacing property.
| | * | Doc: add \since 4.6 to new QGraphicsItem::PanelModality enum.Volker Hilsheimer2009-10-031-0/+1
| | | |
| | * | Silence moc warning.Volker Hilsheimer2009-10-031-0/+1
| | | |
| | * | Compile Rogue example again after state machchine event type rename.Volker Hilsheimer2009-10-031-1/+1
| | | |
| | * | Enable multitouch on the Gradients demoBenjamin Poulain2009-10-021-1/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| | * | Enable multitouch on the affine demoBenjamin Poulain2009-10-021-1/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| | * | Add multitouch to the PathStroke demoBenjamin Poulain2009-10-023-5/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add multitouch to the position of the path, and enable multitouch on the controls of the demo. Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| | * | Add multitouch capabilities to the shared classes of the demoBenjamin Poulain2009-10-023-1/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add multitouch feature to the HoverPoints and the ArthurWidget. Multitouch is enabled by default for widgets using HoverPoints. The ArthurWidget propagate the TouchEvents in order to have them handled by a parent if a parent accept the touch events. Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| | * | Stablilize autotests on X11Olivier Goffart2009-10-022-7/+14
| | | |
| | * | Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-0290-378/+1086
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: demos/mediaplayer/mediaplayer.pro
| | | * | Changed implementation of qDrawBorderPixmap() to use qDrawPixmaps().Kim Motoyoshi Kalland2009-10-026-240/+262
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | * | Added support for drawing a pixmap multiple times in one call.Kim Motoyoshi Kalland2009-10-029-48/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is internal API. It's possible to specify a horizontal and vertical scale, rotation, opacity and source rectangle for each pixmap item. Useful for particle effects. Reviewed-by: Trond
| | | * | Added qFastSin() and qFastCos() functions.Kim Motoyoshi Kalland2009-10-023-2/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new functions use a lookup table. Reviewed-by: Trond
| | | * | Add prefix to statemachine-specific event typesKent Hansen2009-10-025-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Signal" and "Wrapped" is too generic; prefix with StateMachine. Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | * | Doc: mark API of Gesture framework as preliminary.Volker Hilsheimer2009-10-024-1/+10
| | | | | | | | | | | | | | | | | | | | New API will most likely not be in the Beta release.
| | | * | Adds a bool to QAbstractAnimationPrivate to keep track of top-level animationsLeonardo Sobral Cunha2009-10-022-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also refactored the timer verifications on (un)registerAnimation: we should never register an animation that has a registeredTimer, but we can unregister an animation several times. Reviewed-by: thierry
| | | * | Mac: bugfix 45f095b8970dc3c1b6f6e97fa2323654ba848288Richard Moe Gustavsen2009-10-021-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like I forgot to handle page scrolls. Also did a small optimization (see also 45f095b8970dc3c1b6f6e97fa2323654ba848288)
| | | * | Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-0264-65/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
| | | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-0224-76/+147
| | | |\ \
| | | * | | Enable overriding TARGETTYPE and OPTION statements with MMP_RULESMiikka Heikkinen2009-10-022-19/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If MMP_RULES contains TARGETTYPE or any OPTION statements, default values for these will not be added to MMP file. This allows for example conditional OPTIONs and using native PLUGIN target type using MMP_RULES. Task-number: QT-2229 Reviewed-by: axis
| | * | | | Merge branch '4.6' into mmfphononFrans Englich2009-10-0290-1454/+3387
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-02110-1691/+3819
| | | |\ \ \
| | | | * | | Use multimedia timers on Windows for timers less than 16msBradley T. Hughes2009-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to http://msdn.microsoft.com/en-us/library/ms725496(VS.85).aspx, the system time resolution is 10-16ms, so we should use multimedia timers for anything less than 16ms (the worst case).
| | | | * | | doc: Fixed numerous qdoc errors.Martin Smith2009-10-029-13/+10
| | | | | | |
| | | | * | | Stabilize the SyntheticEnterLeave tests.Paul Olav Tvete2009-10-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset the mouse position to a known state at the start, instead of depending on what the previous test did. Reviewed-by: Jeremy
| | | | * | | Doc: Fixed license header.David Boddie2009-10-021-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | renaming ppc mkspec to powerpcJørgen Lind2009-10-023-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:paul
| | | | * | | Mac: update/small fix to 45f095b8970dc3c1b6f6e97fa2323654ba848288Richard Moe Gustavsen2009-10-023-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that we need to let singleStep keep its value in qtextedit so that pushing the up/down buttons on the slider works as they should. Moreover, overriding the behaviour in abstract slider also makes QGraphicsView work out of the box. Also added in the test fix suggested by Olivier.
| | | | * | | Renamed the values in the Qt::TileRule enum.Trond Kjernåsen2009-10-025-42/+42
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stretch, Repeat and Round are too generic. Renamed to StretchTile, RepeatTile and RoundTile. Reviewed-by: Gunnar
| | | | * | Revert "network selftest: make sure tested file has correct line endings"Markus Goetz2009-10-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ee51f0ee63fe5c6388cea1a1043963303ee3810b. The selftest should "see" the git settings as they are to detect if they are wrong on CRLF platforms. Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com> Reviewed-by: Peter Hartmann
| | | | * | Fix compiler warnings on VS2008Prasanth Ullattil2009-10-0232-67/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled C4396 for both webit and javascript core projects. Fixed some C4100 (unreferenced formal parameter) warnings in Qt code. Reviewed-by: Simon Hausmann
| | | | * | Give the qws ppc mkspec usable default valuesJørgen Lind2009-10-022-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and keep ./configure -embedded still work on ppc platforms Reviewed-by:tom