summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-011-1/+6
|\
| * Merge remote branch 'qt-doc-review/master'Casper van Donderen2011-08-312-2/+2
| |\
| | * Merge branch '4.8'Casper van Donderen2011-08-302-7/+8
| | |\
| * | \ Merge remote branch 'qt-doc-team/4.8'Casper van Donderen2011-08-291-1/+6
| |\ \ \ | | | |/ | | |/|
| | * | Doc: Small addition to the QML anchor layout docsGeir Vattekar2011-08-241-1/+6
| | * | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-092-24/+7
| | |\ \
| | * \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2448-481/+481
| | |\ \ \
| | * \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-161-0/+123
| | |\ \ \ \
* | | \ \ \ \ Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-311-4/+3
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-272-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Improve documentation for QDeclarativeView::setSource()Keith Isdale2011-08-181-4/+3
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-312-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-08-302-2/+2
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-262-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1110-63/+165
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtAaron Kennedy2011-08-0410-63/+161
| |\ \ \ \ \ \
| | * | | | | | Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-07-012-2/+2
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-243-11/+25
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-202-24/+7
| | | |\ \ \ \ \
| | | * | | | | | Qmlshadersplugin examples added.Marko Niemelä2011-06-131-11/+12
| | | * | | | | | Qmlshadersplugin API documentation enhancements.Marko Niemelä2011-06-132-0/+13
| | * | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-172-18/+5
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-312-24/+7
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | / | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-272-24/+7
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-272-24/+7
| | * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2448-481/+604
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Doc: Various fixes to documentation, some based on changes in master.David Boddie2011-05-113-31/+35
| | * | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-044-1/+94
| * | | | | | DocAaron Kennedy2011-07-291-1/+1
| * | | | | | DocAaron Kennedy2011-07-291-1/+5
| | |/ / / / | |/| | | |
* | | | | | Document state fast-forwarding.Michael Brasser2011-07-071-0/+22
* | | | | | qmlplugindump: Update qmltypes file format documentation.Christian Kamm2011-07-051-2/+4
|/ / / / /
* | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-1748-481/+481
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-1748-480/+480
| |\ \ \
| | * | | Update licenseheader text in source filesJyri Tahtela2011-05-1348-480/+480
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-131-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | doc: Fixed a QML snippet referenceMartin Smith2011-05-091-1/+1
* | | | Allow 'typeinfo <file>' lines in qmldir.Christian Kamm2011-05-121-0/+123
| |_|/ |/| |
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-121-0/+19
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-121-0/+19
| |\ \
| | * | Allow enum values to be used as signal parametersBea Lam2011-04-121-0/+19
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-0/+206
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-041-0/+206
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Document using Behaviors with States.Michael Brasser2011-04-041-0/+206
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3137-2212/+1935
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-229-42/+294
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-082-2/+12
| |\ \ \
| | * | | Added Qt Quick License information.Jerome Pasion2011-03-032-2/+12
| * | | | Doc: Fixed QML snippet highlighting by creating a complete code snippet.David Boddie2011-03-031-4/+1
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-013-6/+8
| |\ \ \