summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-012-6/+6
|\
| * 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
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-305-2/+108
|\ \ | |/
| * 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
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-291-4/+9
|\ \ \ | |/ /
| * | Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-291-4/+9
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-261-0/+1
|\ \ | |/
| * Only patch package content that is necessary for self-signingMiikka Heikkinen2010-11-251-0/+1
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-251-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 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
* | | | | | Doc: Fixed a snippet to show QML comments.David Boddie2010-11-251-1/+0
* | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-243-6/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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-232-6/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-222-6/+6
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-221-5/+4
| | |\ \ \
| | | * | | Docs: QTBUG-10866 Description of how AutoConnection is resolved.Peter Yard2010-11-221-5/+4
| | | |/ /
| | * | | DocAaron Kennedy2010-11-221-1/+2
| | |/ /
* | | | Doc: Added general statements about reentrancy and thread safety.David Boddie2010-11-231-5/+15
|/ / /
* | | 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
| |\ \ \ | | |/ /
| | * | Fix license text.Jason McDonald2010-11-172-10/+10
| | * | Doc: fix a typo in QML/Qt UI integrationPierre Rossi2010-11-161-1/+1
* | | | 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
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-151-0/+16
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-111-0/+16
| | | |\ \ | | | | |/ | | | |/|
| | | | * Added an example for QTest::touchEvent to the documentation.Denis Dzyubenko2010-11-111-0/+16
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-151-1/+16
| | |\ \ \
| | * | | | Ensure loaded item's parent is set before component completion.Martin Jones2010-11-122-0/+124
| | | |/ / | | |/| |
| * | | | 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-157-16/+16
| | |/ / | |/| |
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-111-0/+3
| |\ \ \ | | |/ /
| | * | Doc: update symbian capabilities regarding SSLShane Kearns2010-11-111-0/+3
| | |/