summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+3
|\
| * Doc fix, ensure that the \obsolete tag is placed correctlyAndy Shaw2010-02-171-1/+3
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-181-6/+72
|\ \
| * | Added a new flag to fine-tune gesture propagation policyDenis Dzyubenko2010-02-171-6/+72
* | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-172-21/+42
|\ \ \ | |/ / |/| / | |/
| * Don't crash when QTouchEvent is accepted but not handled by aBradley T. Hughes2010-02-161-1/+8
| * Correctly mark QGraphicsScene::drawItems() as obsoleteAndy Shaw2010-02-151-1/+3
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-121-6/+14
| |\
| | * Implemented GraphicsView Panel support for gestures.Denis Dzyubenko2010-02-121-6/+14
| * | doc: Added some since version information.Martin Smith2010-02-121-13/+17
| |/
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-131-0/+7
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-101-0/+7
| |\ \
| | * | Remove hacky fix (breaks autotest).Michael Brasser2010-02-051-1/+0
| | * | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-041-0/+8
| | |\ \
| | | * | Add bug note.Michael Brasser2010-02-041-1/+1
| | | * | Fix compile on visual, changed NaN checks to use qIsNaN instead of isnan.Joona Petrell2010-02-031-2/+3
| | | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-023-12/+31
| | | |\ \
| | | * | | Tests for NaN values in the property x, y, widht and height setters ofMarco Bubke2010-02-011-0/+6
| | | * | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-278-136/+262
| | | |\ \ \
| | | * \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-201-0/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-193-18/+52
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-1451-76/+101
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-051-3/+16
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-1713-45/+208
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-108-234/+449
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix crash.Michael Brasser2009-12-081-0/+1
| | | * | | | | | | | | Fix crash.Michael Brasser2009-12-081-1/+1
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-073-25/+7
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-305-226/+32
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-277-26/+41
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-197-371/+197
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-115-8/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Revert 4bf7f90a27377f439e86d6175e5e3cdebd131be0 and implement differently.Warwick Allison2009-11-101-3/+0
| | | * | | | | | | | | | | | | | Remove no-op diff to 4.6.Warwick Allison2009-11-091-1/+0
| | | * | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-0916-480/+1115
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Remove "to" limit on minor version.Warwick Allison2009-11-051-0/+3
| | | * | | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-049-25/+54
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Rename QFx classes to QmlGraphicsAaron Kennedy2009-10-301-1/+1
| | | * | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into kinet...Aaron Kennedy2009-10-2912-217/+504
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-294-9/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-261-3/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-2516-546/+1026
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-1911-233/+525
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-063-8/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-043-14/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-0211-168/+506
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-09-291-0/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Don't call virtual setPosHelper during destructionAaron Kennedy2009-09-291-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | doc: Fixed several typos.Martin Smith2010-02-121-1/+1
generated by cgit v0.12 at 2024-10-26 22:21:54 (GMT)