summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* 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-1310-23/+387
|\ \ | |/
| * 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-098-4/+336
| |\
| | * Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-064-1/+156
| | * 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-064-0/+178
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0328-316/+1287
| |\ \ | | |/
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-021-0/+9
| |\ \
| * \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-012-6/+6
| |\ \ \
| * \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-305-2/+108
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-291-4/+9
| |\ \ \ \ \
| * | | | | | 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-0636-328/+1420
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-0328-316/+1287
| | |_|_|_|/ | |/| | | |
| * | | | | Cleaned up sis_targets.prfMiikka Heikkinen2010-12-021-0/+9
| | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-011-1/+1
| |\ \ \ \
| | * | | | Fix two minor doc errorsAndy Shaw2010-12-011-1/+1
| | | |_|/ | | |/| |
| * | | | Fix license header.Jason McDonald2010-12-011-5/+5
| |/ / /
| * | | Document which header to include for qmlRegister functions.Martin Jones2010-11-303-1/+19
| * | | Fix id documentationBea Lam2010-11-301-1/+1
| * | | Link to List Properties docs from QML Intro pageBea Lam2010-11-301-0/+4
| * | | Add license to example codeBea Lam2010-11-291-0/+39
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-291-0/+45
| |\ \ \ | | |_|/ | |/| |
| | * | Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-291-0/+45
| | |/
| * | Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-291-4/+9
| |/
| * Only patch package content that is necessary for self-signingMiikka Heikkinen2010-11-251-0/+1
* | Fix license header.Jason McDonald2010-12-061-5/+5
* | QScroller merge, part 1Robert Griebl2010-12-021-0/+109
* | Fix license headersJason McDonald2010-12-012-10/+10
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-2515-30/+552
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-241-0/+8
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-241-0/+8
| | |\
| | | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-2312-29/+528
| | | |\
| | | * \ Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-187-12/+167
| | | |\ \
| | | * | | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-0/+8
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix incorrect example for Qt.rgba()Bea Lam2010-11-241-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-222-5/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-222-5/+19
| | |\ \ \
| | | * | | Doc: Q_PROPERTY, implements the setter/getter in the exampleOlivier Goffart2010-11-222-5/+19
| | | | |/ | | | |/|
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-2211-23/+522
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-193-11/+11
| | |\ \ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-173-11/+11
| | | |\ \ \ | | | | |/ /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-1761-382/+2667
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-153-0/+140
| | | |\ \ \
| | | * | | | Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt QuickMorten Engvoldsen2010-11-153-2/+501