summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-051-3/+0
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-0110-116/+182
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-0110-116/+182
| |\
| | * Changing width of RTL positioner doesn't relayoutMartin Jones2011-04-011-0/+10
| | * PinchArea and Flickable don't work well enough togetherMartin Jones2011-03-314-111/+146
| | * Once Image sourceSize is set there is no way to clear it.Martin Jones2011-03-313-1/+17
| | * Canceling image download while reading causes crashMartin Jones2011-03-302-2/+5
| | * Fix width of TextInput micro focus rectangle.Andrew den Exter2011-03-301-2/+4
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-317-22/+23
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-301-1/+1
| |\ \ | | |/
| | * GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-277-21/+22
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2230-530/+1831
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-0912-80/+272
| | |\ \
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-011-1/+1
| | * | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-284-14/+35
| | |\ \ \
| | * \ \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-2319-112/+310
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'mimir' into 4.7David Boddie2011-02-234-9/+9
| | |\ \ \ \ \
| | | * | | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-194-9/+9
| | | * | | | | Merge branch '4.7' into mimirDavid Boddie2010-12-158-24/+51
| | | |\ \ \ \ \
| | * | | | | | | Doc: Fixed a code snippet.David Boddie2011-02-221-2/+2
| | * | | | | | | Doc: Fixed links and whitespace.David Boddie2011-02-171-1/+1
| | * | | | | | | Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-171-7/+7
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7David Boddie2011-01-259-74/+139
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-1780-146/+175
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-052-0/+4
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-7/+7
| | * | | | | | | | | | | Doc: VisualDataModel.rootIndex is only affects hierarchical modelsGeir Vattekar2011-02-171-1/+2
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0445-409/+3218
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-242-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix warning about maybe-uninitialised use of variableThiago Macieira2011-03-221-0/+1
| * | | | | | | | | | | | | | Fix warning about comparing Qt::Orientation to QDeclarativeView::OrientationThiago Macieira2011-03-221-1/+1
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-211-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-223-36/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | / / / / / / / / / / / / | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | fixes/improvements for new QML right-to-left docsBea Lam2011-03-212-35/+54
| * | | | | | | | | | | | Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-181-1/+1
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-173-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | PathView doesn't update if preferred highlight range changes.Martin Jones2011-03-171-0/+2
| * | | | | | | | | | | | Image.PreserveAspectFit has unexpected effect on Image's sourceSizeMartin Jones2011-03-172-5/+7
| * | | | | | | | | | | | Doc improvement for Image.fillMode.Yann Bodson2011-03-171-2/+5
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-164-10/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-161-3/+5
| * | | | | | | | | | | | Border still drawn on Rectangle elements when border.width == 0Martin Jones2011-03-151-2/+2
| * | | | | | | | | | | | Regression: currentIndex was not set correctly after model cleared.Martin Jones2011-03-152-5/+7
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-114-16/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Update QML "What's New" docs.Martin Jones2011-03-113-2/+6
| * | | | | | | | | | | | Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.Andrew den Exter2011-03-111-1/+6
| * | | | | | | | | | | | Fix ListView boundary extents for RTL layout.Martin Jones2011-03-111-9/+39
| * | | | | | | | | | | | Fix compiler warning.Andrew den Exter2011-03-111-4/+4