summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-1753-546/+885
|\
| * Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-174-14/+16
| |\
| * | Doc: css fine tuningMorten Engvoldsen2010-09-171-3/+3
| * | Merge branch '4.7' into fridayMorten Engvoldsen2010-09-17362-4120/+3252
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16356-4102/+3214
| | |\ \
| | * | | Doc: Fixed a non-compiling example.David Boddie2010-09-161-0/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-1690-517/+3581
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-14238-5528/+10285
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'fixesfor4.7' into 4.7David Boddie2010-09-13229-3261/+8303
| | |\ \ \ \ \
| | | * | | | | moving tutorials out of gitignore. Reviewed by Robert GrieblRoland Wolf2010-09-081-0/+1
| | | * | | | | small fixes on the modelview tutorialRoland Wolf2010-09-081-11/+19
| | | * | | | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | * | | | | fix for compilation with namespaceRoland Wolf2010-09-082-2/+2
| | | * | | | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | * | | | | fix for compilation with namespaceRoland Wolf2010-09-084-6/+22
| | * | | | | | compilation with namespaces was broken. fixedRoland Wolf2010-09-062-3/+1
| | * | | | | | Merge remote branch 'upstream/4.7' into 4.7Roland Wolf2010-09-06280-4099/+12074
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/msculls-modelview-qdoc-enhanc...Roland Wolf2010-09-0240-858/+541
| | |\ \ \ \ \ \ \
| * | | | | | | | | Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
| * | | | | | | | | Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
| * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| * | | | | | | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| * | | | | | | | | Merge branch '13092010doc' into doc-4.7Morten Engvoldsen2010-09-162-24/+58
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-162-15/+5
| | * | | | | | | | | Doc: fixing creator bug in page footerMorten Engvoldsen2010-09-161-1/+8
| | * | | | | | | | | Doc: correcting html template - validatingMorten Engvoldsen2010-09-161-1/+1
| | * | | | | | | | | Doc: fixing issues with table indent - cssMorten Engvoldsen2010-09-161-3/+3
| | * | | | | | | | | Doc: Fixing style: line height, ol indent, coulmns (css3)Morten Engvoldsen2010-09-161-16/+43
| | * | | | | | | | | Doc: correcting html templateMorten Engvoldsen2010-09-161-28/+22
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-169-142/+113
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-166-141/+90
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Doc: Cleaning up the known issues page. Pointing people to check the online r...Morten Engvoldsen2010-09-161-120/+5
| | | * | | | | | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-162-5/+53
| | | * | | | | | | | Doc: Removing section about Multimedia - playback and declarative elements. T...Morten Engvoldsen2010-09-161-9/+0
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-152-7/+32
| | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | Doc: Updated the Mac requirements page.Geir Vattekar2010-09-161-0/+3
| | |/ / / / / / / / /
| | * | | | | | | | | Doc: Listed undoable operations in QTextDocumentGeir Vattekar2010-09-151-1/+12
| | * | | | | | | | | Doc: Note on updating proxy models with dynamic sort filtersGeir Vattekar2010-09-151-0/+8
| * | | | | | | | | | Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299...Morten Engvoldsen2010-09-151-28/+22
| |/ / / / / / / / /
| * | | | | | | | | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-1581-357/+3403
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | qdoc: Fixed an html formatting error in the QML property list.Martin Smith2010-09-151-21/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1346-246/+697
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1110-112/+72
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1047-46/+2534
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-10217-5751/+9244
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Doc: Added info on compression to rcc docsGeir Vattekar2010-09-101-1/+21
| | * | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-09216-5750/+9223
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Clarified the coding standard regarding connecting signals to slots.Jerome Pasion2010-09-102-3/+15
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Doc: Excluded the libconninet library from the documentation.David Boddie2010-09-084-6/+10