summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* 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-072-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
| | * | | | Changed inline code to snippet code.Jerome Pasion2011-03-222-4/+3
| | * | | | Edited QtWebKit Guide.Jerome Pasion2011-03-216-538/+749
| | * | | | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7Jerome Pasion2011-03-183-5/+5
| | |\ \ \ \
| | * | | | | Edited Canvas and Storage chapters of QtWebKit guide.Jerome Pasion2011-03-186-749/+538
| | * | | | | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-174-793/+587
| | * | | | | Added Qt WebKit module name into license headers.Jerome Pasion2011-03-165-5/+5
| | * | | | | Fixed style issues with QtWebKit guide and examples.Jerome Pasion2011-03-153-121/+121
| | * | | | | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-1565-1/+4052
| | * | | | | Changed Creator qthelp URL from 2095 to 210.Jerome Pasion2011-03-141-15/+15
| | * | | | | Resized images and changed their color mode to reduce file size.Jerome Pasion2011-03-102-0/+0
| | * | | | | Whitespace fixes.Jerome Pasion2011-03-105-55/+55
| | * | | | | Imported demo documentation and their images.Jerome Pasion2011-03-108-34/+225
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-091-2/+2
| | |\ \ \ \ \
| | * | | | | | Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-036-129/+237
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-061-41/+158
|\ \ \ \ \ \ \ \
| * | | | | | | | Doc: Updating 3rdparty license docaavit2011-04-041-41/+158
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-051-0/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add branch prediction macrosAlberto Mardegan2011-04-041-0/+24
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-31372-8563/+13496
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2220-62/+614
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-182-4/+4
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Doc: Fixed reference to absolete API in exceptionsafety.htmlGeir Vattekar2011-03-171-2/+3
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-171-1/+1
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed doc bug in undo framework exampleGeir Vattekar2011-03-171-2/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-141-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Doc: Fixed snippet documenting QMetaObject::classInfoThorbjørn Lindeijer2011-03-141-1/+1
| | |/ / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-084-4/+54
| |\| | | |