summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-04-274-16/+69
|\
| * Fix update issue when an item has an effect and child.Alexis Menard2010-04-271-1/+1
| * Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints.Alexis Menard2010-04-272-9/+37
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-231-1/+10
| |\
| | * When using Qt::BypassGraphicsProxyWidget with QMenu the application is not st...Alexis Menard2010-04-221-1/+10
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-222-0/+11
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-172-0/+11
| | |\
| | | * Avoid calling QGraphicsItem::setTransformOriginPoint() until neededMartin Jones2010-04-162-0/+11
| * | | Fixes wrong QGraphicsView's viewport cursor reset.Yoann Lopes2010-04-211-5/+7
| * | | Fixes keyboard shortcuts for QGraphicsTextItem.Yoann Lopes2010-04-201-0/+3
| |/ /
* | | Fixes selection being cleared when right clicking on a selected item.Yoann Lopes2010-04-261-1/+1
* | | Merge branch 'master' of git:qt/oslo-staging-2Thiago Macieira2010-04-221-0/+6
|\ \ \ | |/ / |/| |
| * | QAbstractGraphicsShapeItem: ignore already set pen or brushMarkus Hossner2010-04-211-0/+6
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-163-1/+40
|\ \ \ | |_|/ |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-151-1/+1
| |\ \
| | * | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
| * | | Fixes tooltips for QGraphicsProxyWidget.Yoann Lopes2010-04-153-0/+39
| |/ /
* | | Rename QDeclarativeData -> QAbstractDeclarativeDataAaron Kennedy2010-04-151-1/+1
* | | Reduce warnings at shutdownAaron Kennedy2010-04-141-2/+10
* | | Merge branch '4.7' into reviews/2361Alexis Menard2010-04-143-4/+28
|\ \ \
| * | | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-141-1/+3
| * | | Move effect property where it should be.Alexis Menard2010-04-131-0/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-132-3/+22
| |\ \ \ |/ / / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-072-3/+22
| |\ \ \
| | * | | Allow iteration over the Item.children propertyAaron Kennedy2010-04-072-3/+22
* | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-122-3/+3
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Fixes CursorChange and TooltipChange events delivery for QGraphicsWidgetYoann Lopes2010-04-071-2/+2
| * | | Fixes painting artifacts when scaling a QGraphicsProxyWidget.Yoann Lopes2010-04-071-1/+1
* | | | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| |/ / |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-312-7/+168
|\ \ \
| * \ \ Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-311-1/+1
| |\ \ \
| * | | | Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.Alexis Menard2010-03-312-0/+38
| * | | | Micro optimization after feedback from Jan-Arve.Alexis Menard2010-03-311-1/+1
| * | | | Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7Thiago Macieira2010-03-301-0/+2
| * | | | Fix bad merge from 4.6.Thiago Macieira2010-03-301-2/+4
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-309-219/+461
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-302-6/+129
| | |\ \ \ \
| | | * \ \ \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-251-0/+6
| | | |\ \ \ \
| | | * | | | | itemChange() is now called when transformation properties change.Yoann Lopes2010-03-252-6/+129
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-311-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | QGraphicsEffect : Don't rely on the exposedArea when rendering the item into ...Alexis Menard2010-03-311-1/+1
* | | | | | | | Revert 4.6 commits that shouldn't be in 4.7.Thiago Macieira2010-03-317-1/+254
* | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-316-251/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Revert "Add a children private property needed for QML to support QGraphicsOb...Alexis Menard2010-03-316-245/+0
| * | | | | | Revert "struct -> class, it's better."Alexis Menard2010-03-311-2/+1
| * | | | | | Revert "Add NOTIFY to size property so QML bindings are working fine."Alexis Menard2010-03-312-9/+1
| * | | | | | Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry chan...Alexis Menard2010-03-312-4/+6
| * | | | | | Revert "Add a a layout property in QGraphicsWidget."Alexis Menard2010-03-312-3/+0
| |/ / / / /
| * | | | | struct -> class, it's better.Alexis Menard2010-03-301-1/+2
| * | | | | Add a a layout property in QGraphicsWidget.Alexis Menard2010-03-302-0/+3