summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-062-88/+138
|\
| * Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| * Doc fixes for introduction page and Item docsBea Lam2011-01-061-83/+130
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-237-347/+276
|\ \ | |/
| * Document the 'variant' basic typeBea Lam2010-12-222-12/+87
| * Add double type to QML Basic Types docsBea Lam2010-12-221-0/+20
| * Remove redundant docsBea Lam2010-12-221-81/+0
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-214-254/+169
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-133-21/+109
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-091-2/+2
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-081-0/+1
| | |\ \ \
| | | * | | Doc: Added a link to the QML Basic Types page.David Boddie2010-12-071-0/+1
| | * | | | Doc: Added link to QML Basic Types in main Qt Quick page.Jerome Pasion2010-12-081-0/+1
| | |/ / /
| | * | | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-061-219/+120
| | * | | Added QML coding convention for "private" properties.Jerome Pasion2010-12-061-3/+15
| | * | | Some whitespace fixes.Jerome Pasion2010-12-061-32/+32
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-202-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Update docs on importing javascript filesBea Lam2010-12-202-1/+5
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| | |_|/ | |/| |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-134-23/+111
|\ \ \ \ | |/ / /
| * | | Improvements to anchoring docsBea Lam2010-12-091-17/+49
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-092-4/+60
| |\ \ \ | | |_|/ | |/| |
| | * | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-061-1/+33
| | * | Some doc clarification for components and javascript integrationBea Lam2010-12-061-3/+2
| | * | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-061-0/+25
| | |/
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-039-315/+342
| |\ \ | | |/
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-011-5/+5
| |\ \
| * \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-303-1/+23
| |\ \ \
| * | | | Fix documentation for QML extended typesCaio Marcelo de Oliveira Filho2010-11-291-2/+2
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0612-321/+370
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-039-315/+342
| | |_|/ | |/| |
| * | | Fix license header.Jason McDonald2010-12-011-5/+5
| | |/ | |/|
| * | Document which header to include for qmlRegister functions.Martin Jones2010-11-302-0/+18
| * | Fix id documentationBea Lam2010-11-301-1/+1
| * | Link to List Properties docs from QML Intro pageBea Lam2010-11-301-0/+4
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-258-18/+518
|\ \ | |/
| * Fix incorrect example for Qt.rgba()Bea Lam2010-11-241-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-227-16/+515
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-172-6/+6
| | |\
| | * | Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt QuickMorten Engvoldsen2010-11-153-2/+501
| | * | Doc: Correcting references to Qt Declarative module.Morten Engvoldsen2010-11-155-14/+14
| * | | DocAaron Kennedy2010-11-221-1/+2
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-192-6/+6
|\ \ \ | |/ /
| * | Fix license text.Jason McDonald2010-11-171-5/+5
| * | Doc: fix a typo in QML/Qt UI integrationPierre Rossi2010-11-161-1/+1
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-126-173/+684
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-095-171/+580
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-044-170/+575
| | |\
| | | * Largely rewrite the Using QML in C++ Applications documentation. ItBea Lam2010-11-042-163/+488