summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-0332-302/+388
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-0111-117/+184
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-0111-117/+184
| | |\
| | | * 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-303-3/+7
| | | * 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-3122-185/+204
| |\ \ \ | | |/ /
| | * | 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-2722-184/+201
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2236-534/+1910
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-0916-97/+312
| | | |\ \
| | | * | | Doc: Small change to ListModel docsGeir Vattekar2011-03-071-1/+1
| | | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-012-2/+2
| | | * | | Merge branch 'mimir' into 4.7Martin Smith2011-03-011-1/+1
| | | |\ \ \
| | | | * | | qdoc: Added more descriptions for QML commands.Martin Smith2011-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-2341-275/+743
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge branch 'mimir' into 4.7David Boddie2011-02-235-11/+11
| | | |\ \ \ \ \
| | | | * | | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-195-11/+11
| | | | * | | | | Merge branch '4.7' into mimirDavid Boddie2010-12-1517-94/+171
| | | | |\ \ \ \ \
| | | * | | | | | | Doc: Fixed a code snippet.David Boddie2011-02-221-2/+2
| | | * | | | | | | Doc: Fixed links and whitespace.David Boddie2011-02-178-17/+31
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-171-1/+2
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-02-171-0/+2
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | 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-doc-team into 4.7Jerome Pasion2011-02-151-0/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-081-0/+2
| | | | |/ / / / / / /
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-07126-1244/+6186
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-04126-1243/+6185
| | | | |\ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-0433-261/+358
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17297-403/+421
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-056-31/+29
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-209-178/+178
| | * | | | | | | | | | | | Fix memory leak.Martin Jones2011-03-241-0/+2
* | | | | | | | | | | | | | Remove Font Smoothing hack for OS XJiang Jiang2011-03-311-8/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Fix warning about unused parameterThiago Macieira2011-03-271-1/+1
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-244-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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 'mainline/master'Oswald Buddenhagen2011-03-227-9/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+14
* | | | | | | | | | | | | | | 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-224-37/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | / / / / / / / / / / / | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix writing to an attached property from script.Michael Brasser2011-03-211-1/+1
| * | | | | | | | | | | | 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