summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |/ / /
| * | | 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
* | | | 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
|/ / /
* | | 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
| |\ \ \
| | * | | Fixed broken link.Jerome Pasion2011-03-012-3/+4
| | * | | Edited sentences in QML Views documentation.Jerome Pasion2011-03-011-3/+4
| * | | | Doc: Fixed qdoc warnings.David Boddie2011-03-012-57/+45
| |/ / /
| * | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-281-3/+3
| |\ \ \
| * \ \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-232-164/+208
| |\ \ \ \
| * \ \ \ \ Merge branch 'mimir' into 4.7David Boddie2011-02-233-9/+5
| |\ \ \ \ \
| | * | | | | qdoc: Removed some uses of \raw an d \endraw.Martin Smith2011-01-201-3/+0
| | * | | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-192-6/+6
| | * | | | | Merge branch '4.7' into mimirDavid Boddie2010-12-155-23/+112
| | |\ \ \ \ \
| * | | | | | | Removed GestureArea link from the elements page.Jerome Pasion2011-02-211-1/+0
| * | | | | | | Doc: Fixed links and whitespace.David Boddie2011-02-1717-53/+51
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/jpasions-qt-doc-team-qtquick ...David Boddie2011-02-1729-1766/+819
| |\ \ \ \ \ \ \
| | * | | | | | | Adding snippet code to coding article.Jerome Pasion2011-02-171-36/+0
| | * | | | | | | Wrote an overview for the WebKit QML module.Jerome Pasion2011-02-171-11/+19
| | * | | | | | | Removed section names and added a link to Qt Quick page.Jerome Pasion2011-02-1712-105/+76
| | * | | | | | | Added a qdoc keywordJerome Pasion2011-02-161-1/+1
| | * | | | | | | Removed links to unfinished documentation.Jerome Pasion2011-02-161-4/+0
| | * | | | | | | Re-wrote QML Views overview page. Created new snippets and images.Jerome Pasion2011-02-161-48/+56
| | * | | | | | | Added new snippet code.Jerome Pasion2011-02-161-2/+3
| | * | | | | | | Resized image and took out extra lines.Jerome Pasion2011-02-161-2/+0