summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-0616-45/+35
| | | |\ \
| | | * | | Doc: Fixing bug in QML tutorialMorten Engvoldsen2010-10-061-1/+1
| | * | | | Doc: Fixing spacing bug in columnsMorten Engvoldsen2010-10-061-1/+1
| * | | | | Added installation section and fixed some whitespace.Jerome Pasion2010-10-061-36/+46
| | |_|/ / | |/| | |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0516-45/+35
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-041-2/+3
| |\ \ \ \
| * | | | | Added the QtWebKit bridge Image Analyzer example.Jerome Pasion2010-10-045-2/+160
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-04145-155/+230
| |\ \ \ \ \
| * | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-04533-2665/+2665
| * | | | | | Doc: Made a number of fixes to the documentation.David Boddie2010-10-047-11/+59
| * | | | | | Doc: Shorten lists of basic QML types.David Boddie2010-09-302-22/+11
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-3010-196/+472
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-20135-201/+668
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Fixed qdoc warnings for Phonon documentation.David Boddie2010-09-201-0/+77
| * | | | | | | | Doc: More work on QML reference documentation.David Boddie2010-09-172-0/+125
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-191-0/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2010-10-191-0/+35
* | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Update color type docs to mention transparencyBea Lam2010-10-131-0/+2
* | | | | | | | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-1/+1
* | | | | | | | | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-081-8/+8
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-072-0/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implement support for DEPLOYMENT.display_name in SymbianMiikka Heikkinen2010-10-072-0/+11
| * | | | | | | | | Added .flags modifier support for DEPLOYMENT items in SymbianMiikka Heikkinen2010-10-072-0/+24
| * | | | | | | | | Make default application deployment removableMiikka Heikkinen2010-10-072-0/+20
* | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-074-156/+344
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-054-156/+344
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-044-156/+344
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | / / | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-01139-150/+206
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Doc: Fixing link titles and error color in search resultsMorten Engvoldsen2010-10-011-2/+8
| | | * | | | | Doc: Implementing features to the search feature.Morten Engvoldsen2010-10-013-2/+6
| | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-303-1/+10
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Doc: Implementing new doc search dialog.Morten Engvoldsen2010-09-293-88/+152
| | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-4/+3
| | | |\ \ \ \ \
| | | | * | | | | Doc: fixing slim fit style - search box.Morten Engvoldsen2010-09-281-4/+3
| | | * | | | | | Doc: add style to new search resultsMorten Engvoldsen2010-09-281-1/+79
| | | * | | | | | Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-284-18/+48
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-0/+39
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-282-15/+6
| | | | | |\ \ \ \ \
| | | | | * | | | | | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | | * | | | | | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-281-3/+3
| | | | | |/ / / / / | | | | |/| | | | |
| | | * | | | | | | Doc: Implementing new search displayMorten Engvoldsen2010-09-241-93/+130
| | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-0516-44/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0416-45/+35
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Doc: add missing image.Yann Bodson2010-10-012-7/+7
| | * | | | | | | Doc: typographical and spelling errors.Yann Bodson2010-10-0114-28/+28
| | * | | | | | | Doc: remove unfinished and confusing mention to focus panels.Yann Bodson2010-10-011-10/+0
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-011-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-301-2/+3
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-051-2/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |