summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'lighthouse/4.7' into lighthouse-masterJørgen Lind2010-08-053-6/+12
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-302-3/+9
| |\
| | * Remove use of shared NOTIFY signals in QGraphicsScaleMartin Jones2010-07-292-3/+9
| * | Fixed spelling mistakes in documented functions, classes, etc. Part of QTBUG-...Jerome Pasion2010-07-291-3/+3
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-285-20/+66
|\ \ | |/
| * Check the gesturemanager pointer before accessing it.Denis Dzyubenko2010-07-271-3/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-231-0/+1
| |\
| | * doc: Added missing \since 4.7 to effect propertyu.Martin Smith2010-07-231-0/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-212-0/+13
| |\ \ | | |/ | |/|
| | * QML focus API updates.Michael Brasser2010-07-212-0/+13
| * | QGraphicsItem: Animation leaves drawing artifacts when clipping is used.Bjørn Erik Nilsen2010-07-201-1/+6
| |/
| * Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-171-1/+2
| |\
| | * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-07-162-8/+6
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-141-1/+2
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-101-1/+2
| | | |\ \
| | | | * | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+2
| * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-07-162-7/+34
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-152-7/+34
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fixed missing clip when computing the graphics item effect source rect.Samuel Rødal2010-07-022-7/+34
| * | | | | Work around memory leak issue in grid and linear layouts.Andreas Aardal Hanssen2010-07-142-8/+6
| |/ / / /
* | | | | Fix the CGContext on Mac OS X. Sometimes we gotFabien Freling2010-07-221-15/+19
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-155-9/+28
|\ \ \ \ \ | |/ / / /
| * | | | Fixes QGraphicsItem::focusItem() returning incorrect value.Yoann Lopes2010-07-131-2/+4
| * | | | Fixes crash in QGraphicsScene::addItem().Yoann Lopes2010-07-131-2/+2
| | |/ / | |/| |
| * | | Fix subfocus when reparenting panels.Andreas Aardal Hanssen2010-07-081-0/+3
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-014-4/+15
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-014-4/+15
| | |\ \
| | | * | Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation.Bjørn Erik Nilsen2010-06-244-4/+15
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-011-4/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Ensure micro focus is updated in TextEdit and TextInputMartin Jones2010-06-291-4/+7
| | |/ /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-015-9/+48
|\ \ \ \ | |/ / /
| * | | QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets.Jocelyn Turcotte2010-06-301-0/+19
| * | | QGraphicsProxyWidget: Fixes QComboBox popup closing issue.Jocelyn Turcotte2010-06-301-2/+1
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-185-5/+19
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-171-1/+2
| | |\ \
| | | * | Make sure only started gestures can cause cancellationsThomas Zander2010-06-161-1/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-171-1/+2
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-171-1/+8
| | | |\ \ \ | | | | |/ /
| | | * | | clearFocus() shouldn't mess with focus if it doesn't have focusMartin Jones2010-06-171-1/+2
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-163-3/+15
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fixed problem with wrong size hints when items were removed.Jan-Arve Sæther2010-06-163-3/+15
| | | |/ /
| * | | | Doc: Fixed documentation errors.David Boddie2010-06-181-1/+1
| |/ / /
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-s...Denis Dzyubenko2010-06-077-14/+44
| |\ \ \ | | |/ /
| * | | Fixed GestureOverride event delivery in GraphicsView.Denis Dzyubenko2010-06-071-1/+8
* | | | Merge remote branch 'origin/master'Olivier Goffart2010-06-157-2/+36
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-087-2/+36
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add a new qconfig feature GESTURESTasuku Suzuki2010-06-027-0/+32
| | * | | Don't remove the pixmap from cache when not modifying it.Andreas Aardal Hanssen2010-06-011-2/+4
* | | | | Finally, remove some trailing whitespace.Andreas Aardal Hanssen2010-06-1410-33/+33
|/ / / /
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-013-18/+32
|\ \ \ \ | |/ / /