summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-021-4/+4
|\
| * make the $$quote() function less prominentOswald Buddenhagen2011-03-011-4/+4
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-5/+2
|\ \ | |/ |/|
| * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-5/+2
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-171-3/+4
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-171-3/+4
| |\
| | * Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-171-3/+4
* | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-0/+12
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-31988-998/+1006
| |\ \ \
| * | | | Add packagesExist() function to qmake.Robin Burchell2011-01-171-0/+12
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1019-311/+785
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-072-2/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-043-9/+62
| |\ \ \ \
| * | | | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Sergio Ahumada2011-01-281-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-3/+11
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-261-1/+1
| |\ \ \ \ \
| | * | | | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| * | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-262-32/+102
| * | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-242-0/+142
| * | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-21993-1195/+1540
| |\ \ \ \ \ \
| | * | | | | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets.David Boddie2011-01-176-194/+346
| | |/ / / / /
| | * | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13987-1001/+1043
| | |\ \ \ \ \
| | * | | | | | Doc: Added a missing snippet.David Boddie2011-01-131-0/+51
| | * | | | | | Doc: Sync with upstream.David Boddie2010-12-221-1/+1
| | * | | | | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-211-0/+61
| | * | | | | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| * | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-212-71/+69
| |/ / / / / /
| * | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-156-0/+276
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1432-1/+1670
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0759-221/+1701
| |\ \ \ \ \ \ \ \
| * | | | | | | | | doc: Removed an illegal char and some empty \row commands.Martin Smith2010-10-271-1/+1
| * | | | | | | | | doc: Removed some illegal characters.Martin Smith2010-10-271-8/+8
| * | | | | | | | | doc: Removed an illegal character.Martin Smith2010-10-271-1/+1
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-043-9/+62
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Move Qt.application docs into Qt global object pageBea Lam2011-02-021-7/+7
| * | | | | | | | Add initial size to ListView in FolderListModel exampleBea Lam2011-02-021-4/+8
| * | | | | | | | Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-281-5/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19988-997/+1005
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Introduce Qt.application.active propertyJoona Petrell2011-01-071-0/+53
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17988-998/+1006
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Consistent DocsAlan Alpert2011-01-131-3/+11
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Update copyright year to 2011.Jason McDonald2011-01-10988-994/+994
| |/ / / / /
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-234-8/+50
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Improve docs on attached properties on view delegates.Martin Jones2010-12-234-8/+50
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-2313-1/+681
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| | |_|_|/ | |/| | |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-136-0/+276
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0611-0/+593
| * | | | Added QML coding convention for "private" properties.Jerome Pasion2010-12-061-0/+49
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0318-0/+943
| |\ \ \ \