summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-20135-201/+668
|\
| * Doc: Fixing overlapping text problem in columnsMorten Engvoldsen2010-09-201-0/+1
| |
| * Doc: css fine tuningMorten Engvoldsen2010-09-171-3/+3
| |
| * Merge branch '4.7' into fridayMorten Engvoldsen2010-09-17135-192/+632
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16134-181/+613
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-154-6/+65
| | | |\
| | | * | Doc: Further QML improvements.David Boddie2010-09-154-0/+53
| | | | |
| | | * | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-152-5/+4
| | | | |
| | | * | Doc: Continued work on the QML documentation.David Boddie2010-09-142-0/+87
| | | | |
| | | * | Doc: More work on the QML documentation.David Boddie2010-09-14126-126/+268
| | | | |
| | | * | Doc: Some editing and tidying up.David Boddie2010-09-133-51/+9
| | | | |
| | | * | Doc: Added a missing file.David Boddie2010-09-131-0/+193
| | | | |
| * | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen
| * | | | Doc: fixing creator bug in page footerMorten Engvoldsen2010-09-161-1/+8
| | | | |
| * | | | 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: Fixed qdoc warnings for Phonon documentation.David Boddie2010-09-201-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This more or less contains the same documentation as upstream Phonon but can't be merged because we need to maintain our documentation in different files to make qdoc read it. :-( Reviewed-by: Trust Me
* | | | | Doc: More work on QML reference documentation.David Boddie2010-09-172-0/+125
| |/ / / |/| | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-166-133/+127
|\ \ \ \
| * | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| |/ / / | | | | | | | | | | | | Reviewed-by: Henry Haverinen
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-164-134/+58
| |\ \ \
| | * | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵Morten Engvoldsen2010-09-161-120/+5
| | | | | | | | | | | | | | | | | | | | resources.
| | * | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-162-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| | * | | Doc: Removing section about Multimedia - playback and declarative elements. ↵Morten Engvoldsen2010-09-161-9/+0
| | | | | | | | | | | | | | | | | | | | This was descoped from Qt 4.7.
| * | | | Doc: Updated the Mac requirements page.Geir Vattekar2010-09-161-0/+3
| |/ / / | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| * | | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-151-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| | * | Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
* | | | Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-148-270/+347
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-10100-998/+2788
| |\ \ \
| | * | | Doc: Added info on compression to rcc docsGeir Vattekar2010-09-101-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9946 Reviewed-by: David Boddie
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0999-997/+2767
| | |\ \ \ | | | |/ /
| | | * | Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.Miikka Heikkinen2010-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming makefile makes little sense for Symbian toolchains, when we generate so many other files filenames derived from other sources. Task-number: QTBUG-13336 Reviewed-by: Janne Anttila
| * | | | Clarified the coding standard regarding connecting signals to slots.Jerome Pasion2010-09-102-3/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | Cleaned up the contradiction identified in QTBUG-10114. Reviewed-by: David Boddie Bug: QTBUG-8961, QTBUG-10114
| * | | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-071-54/+55
| |\ \ \
| * \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-078-20/+62
| |\ \ \ \
| * \ \ \ \ Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-0314-410/+367
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-023-5/+55
| |\ \ \ \ \ \
| | * | | | | | Adding snippet for QML Text element documentation.Jerome Pasion2010-08-311-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie Task: QTBUG-13243
| | * | | | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-302-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into ↵Morten Engvoldsen2010-08-311-0/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | doc-4.7
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into ↵Morten Engvoldsen2010-08-3071-1693/+3077
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc-4.7 Conflicts: doc/src/getting-started/examples.qdoc doc/src/index.qdoc
| * | | | | | | | Fixed the missing snippet.Jerome Pasion2010-08-251-2/+1
| | | | | | | | |
| * | | | | | | | Small fix.Jerome Pasion2010-08-241-1/+1
| | | | | | | | |
| * | | | | | | | Cleaned up the install pages.Jerome Pasion2010-08-241-260/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: Morten Engvoldsen
| * | | | | | | | Fixed spelling/grammar error.Jerome Pasion2010-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie Tasks: QTBUG-11926, QTBUG-10174
| * | | | | | | | Fixed ampersand.Jerome Pasion2010-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task: QTBUG-12848
| * | | | | | | | Changed "and " to &Morten Engvoldsen2010-08-131-1/+1
| | | | | | | | |
* | | | | | | | | small fixes on the modelview tutorialRoland Wolf2010-09-081-11/+19
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Document difference between property binding and assignmentBea Lam2010-09-082-5/+62
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12629
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-074-14/+17
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |