summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Remove code dupliation in fixupX/Y(), flickX/Y()Martin Jones2010-03-087-467/+326
| | | | Also some minor perf improvements by avoiding signal/slot connection
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-089-24/+30
|\
| * Optimize Rectangle, Image, and Text creation.Michael Brasser2010-03-089-24/+30
| |
* | Add PathView.isCurrentIndex and PathView.view attached propertiesMartin Jones2010-03-083-73/+181
|/ | | | | | Adding PathView attached properties to be in line with other views. Task-number: QT-319
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-057-42/+148
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
| * MouseRegion is dead. Long live MouseArea.Martin Jones2010-03-041-1/+0
| |
| * Merge branch 'tab-navigation' into 4.7Yann Bodson2010-03-042-14/+87
| |\
| | * Add support for tab and backtab in KeyNavigationYann Bodson2010-03-042-14/+87
| | | | | | | | | | | | Task-number: QT-3046
| * | Don't mess with highlight size if highlightFollowsCurrentItem is false.Martin Jones2010-03-041-4/+7
| | | | | | | | | | | | Task-number: QT-2630
| * | Fix ListView contentHeight calculation.Martin Jones2010-03-041-2/+3
| |/ | | | | | | Task-number: QT-2630
| * Documented view behavior when items are removed from start of view.Martin Jones2010-03-042-0/+18
| | | | | | | | Task-number: QTBUG-7694
| * Remove unnecessary additional hash of QDeclarativeGridViewAttachedMartin Jones2010-03-042-21/+7
| |
| * Fix spelling.Martin Jones2010-03-042-2/+2
| |
| * Document that the views do not set clip: true.Martin Jones2010-03-042-0/+10
| | | | | | | | Task-number: QT-2942
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-031-6/+19
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-033-9/+9
| |\ \
| * | | 4.6.x compatWarwick Allison2010-03-031-0/+16
| | | |
* | | | Add mapFromItem() and mapToItem() in QDeclarativeItem.Bea Lam2010-03-042-0/+57
| | | | | | | | | | | | | | | | Task-number: QT-2385
* | | | Removed unused variableBea Lam2010-03-041-1/+0
| |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-033-9/+9
|\ \ \ | | |/ | |/|
| * | More renaming: MouseRegion -> MouseAreaYann Bodson2010-03-031-5/+5
| | |
| * | 'on' syntax fixesYann Bodson2010-03-032-4/+4
| |/
* | Fix painting Rectangle with radius < side/2.Martin Jones2010-03-031-6/+19
|/ | | | | | | | Falls back to using standard QPainter. Also avoid painting odd width borders between pixels, i.e. pixel align painting. Task-number: QTBUG-6675, QTBUG-8317, QTBUG-6786
* Fix mouse stealing in nested flickables.Martin Jones2010-03-031-7/+13
| | | | | | | Set intent to steal mouse, but don't steal the initiating event. This allows other, higher Flickables to override lower. Task-number: QTBUG-5292
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0218-1828/+167
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (28 commits) Add "on" syntax to QmlChanges.txt Don't return QDeclarativeDeclarativeData for a deleting object Empty URL test Fix zooming (broke with transformOrigin default change). doc Move WebView to an extension plugin. follow syntax change missed file Optimization. Add autotests for script block scoping. Make test more reliable. Add NOTIFY signals to list, grid and path views Example of text focus. Add docs and tests for WorkerListModel. Add NOTIFY signals to list, grid and path views Example of text focus. Add accessor operations to VisualItemModel::children Make "on" syntax mandatory for value sources and interceptors Fix warning. Minor optimization. ...
| * Merge branch 'master' into 4.7Warwick Allison2010-03-025-1785/+0
| |\ | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
| | * Move WebView to an extension plugin.Warwick Allison2010-03-025-1785/+0
| | | | | | | | | | | | | | | | | | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995
| | * Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | | | | | | | | | Reviewed-by: akennedy
| * | Add NOTIFY signals to list, grid and path viewsJoona Petrell2010-03-028-36/+124
| | | | | | | | | | | | Reviewed-by: akennedy
| * | Add accessor operations to VisualItemModel::childrenAaron Kennedy2010-03-021-1/+10
| | |
| * | Fix warning.Michael Brasser2010-03-021-1/+0
| | |
| * | Minor optimization.Michael Brasser2010-03-021-2/+3
| | |
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-025-3/+25
| |\ \
| | * | Replace remaining QGuard usage with QDeclarativeGuard.Michael Brasser2010-03-013-3/+6
| | | |
| | * | Expand documention of status property with examplesAlan Alpert2010-03-012-0/+19
| | |/ | | | | | | | | | Task-number: QTBUG-8542
| * | Document TextEdit::textMarginAlan Alpert2010-03-011-0/+5
| |/
* | doc: Fixed some qdoc errors.Martin Smith2010-03-021-1/+1
|/
* Small optimizations.Martin Jones2010-03-012-4/+10
|
* Use setOpacity(0.) rather than setVisible() to avoid positioner relayout.Martin Jones2010-03-011-1/+1
|
* Fix IM repaint.Warwick Allison2010-03-011-0/+2
| | | | Task-number: QT-448
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-017-4/+11
|\
| * Fixed private header include style to work when headers are installed.Rohan McGovern2010-03-013-4/+4
| | | | | | | | | | | | | | | | | | | | Private headers should include other private headers by: #include <private/qfoo_p.h> Using a relative path works during the build, but does not work when building other projects which attempt to use the installed private headers (e.g. unit tests for private classes).
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-03-011-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Add mention of highlightRangeMode in snapMode docs. Fix position of image in detail view.
| * \ Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2787-4981/+5438
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-261-4/+8
| |\ \ \
| * | | | doc: Added \since 4.7 to several \qmlclass elements.Martin Smith2010-02-264-0/+7
| | | | |
* | | | | Set delegate Z before complete() so that view Z is overridden by delegate.Martin Jones2010-03-013-3/+7
| |_|_|/ |/| | |
* | | | Add mention of highlightRangeMode in snapMode docs.Martin Jones2010-03-011-0/+6
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-262-10/+3
|\ \ \
| * | | update painted geometry on pixmapChanged rather than sourceChangedYann Bodson2010-02-262-10/+3
| | | |