summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-161-0/+123
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-...Kai Koehne2011-05-121-0/+123
| |\
| | * Allow 'typeinfo <file>' lines in qmldir.Christian Kamm2011-05-121-0/+123
* | | Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindowRichard Moe Gustavsen2011-05-111-1/+1
* | | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-091-6/+1
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-05-051-0/+49
|\ \
| * \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-04-285-24/+174
| |\ \
| * | | Implement support for enable_backup CONFIG value.Miikka Heikkinen2011-04-261-0/+49
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-033-3/+7
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-023-3/+7
| |\ \ \ \
| | * | | | Fixing potential js hole in the js function for the feedback channel.Morten Engvoldsen2011-04-291-1/+1
| | * | | | Ensured that incomplete downloads are removed.David Boddie2011-04-071-1/+3
| | * | | | Aim to fix Windows builds.David Boddie2011-04-051-1/+3
* | | | | | Merge branch '4.8-upstream'Thierry Bastian2011-04-281-24/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-271-24/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-261-24/+8
| | |\ \ \ \
| | | * | | | Update Symbian platform notes documentationJani Hautakangas2011-04-261-24/+8
* | | | | | | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-261-35/+0
* | | | | | | Merge branch 'master-upstream'Thierry Bastian2011-04-19454-8856/+18302
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-04-182-0/+132
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge earth-team into origin/master'Olivier Goffart2011-04-1286-361/+4567
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-07374-8604/+13678
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-2812-18/+459
| | |\ \ \ \ \ \
| | * | | | | | | network API: add support for HTTP multipart messagesPeter Hartmann2011-03-222-0/+132
| * | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-122-0/+34
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-122-0/+34
| | |\ \ \ \ \ \
| | | * | | | | | Allow enum values to be used as signal parametersBea Lam2011-04-122-0/+34
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0786-361/+4567
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-062-6/+6
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-054-3/+6
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of ../qt-doc-team-threading into 4.7David Boddie2011-04-052-6/+6
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7David Boddie2011-03-29100-234/+4726
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Doc: Minor fix to title.David Boddie2011-03-291-1/+1
| | | | * | | | | | | Merge branch '4.7' of /home/dboddie/git/qt-doc-team into 4.7David Boddie2011-03-182-4/+4
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Doc: Squashed commit of Roland Wolf's threading tutorial.David Boddie2011-03-172-6/+6
| | * | | | | | | | | | 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
| | * | | | | | | | | Removed mobile demos from the Symbian build in demos.proJerome Pasion2011-04-013-0/+5
| | * | | | | | | | | Moved a couple of links into one list.Jerome Pasion2011-03-291-3/+1
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-295-75/+128
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Added a link to the Debugging Techniques article.Jerome Pasion2011-03-281-0/+1
| | | * | | | | | | | Edited the Tutorials and Examples pages. Renamed links in index.qdoc.Jerome Pasion2011-03-254-75/+127
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Doc: Work on GettingStartedQt tutorialGeir Vattekar2011-03-291-110/+114
| | |/ / / / / / /
| | * | | | | | | Doc: Work on a11y docsGeir Vattekar2011-03-243-33/+35
| | * | | | | | | Edited QtWebKit Guide qdoc and added external links.Jerome Pasion2011-03-235-752/+546
| | * | | | | | | Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-2377-139/+4283
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Fixed external link in QtWebKit Guide.Jerome Pasion2011-03-221-2/+2
| | | * | | | | | Fixed style issue and replaced image.Jerome Pasion2011-03-221-0/+0
| | | * | | | | | Changed QtWebKit Guide chapter names and fixed a link.Jerome Pasion2011-03-224-4/+4
| | | * | | | | | Changing qt-webpages.qdoc to contain http links. Online version.Jerome Pasion2011-03-221-20/+20