Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-09-20 | 135 | -201/+668 |
|\ | |||||
| * | Doc: Fixing overlapping text problem in columns | Morten Engvoldsen | 2010-09-20 | 1 | -0/+1 |
| | | |||||
| * | Doc: css fine tuning | Morten Engvoldsen | 2010-09-17 | 1 | -3/+3 |
| | | |||||
| * | Merge branch '4.7' into friday | Morten Engvoldsen | 2010-09-17 | 135 | -192/+632 |
| |\ | |||||
| | * | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-16 | 134 | -181/+613 |
| | |\ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-09-15 | 4 | -6/+65 |
| | | |\ | |||||
| | | * | | Doc: Further QML improvements. | David Boddie | 2010-09-15 | 4 | -0/+53 |
| | | | | | |||||
| | | * | | Doc: Minor improvements to QML-related documentation. | David Boddie | 2010-09-15 | 2 | -5/+4 |
| | | | | | |||||
| | | * | | Doc: Continued work on the QML documentation. | David Boddie | 2010-09-14 | 2 | -0/+87 |
| | | | | | |||||
| | | * | | Doc: More work on the QML documentation. | David Boddie | 2010-09-14 | 126 | -126/+268 |
| | | | | | |||||
| | | * | | Doc: Some editing and tidying up. | David Boddie | 2010-09-13 | 3 | -51/+9 |
| | | | | | |||||
| | | * | | Doc: Added a missing file. | David Boddie | 2010-09-13 | 1 | -0/+193 |
| | | | | | |||||
| * | | | | Doc: Updated What's new in 4.7 page | Geir Vattekar | 2010-09-16 | 1 | -1/+68 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen | ||||
| * | | | | Doc: fixing creator bug in page footer | Morten Engvoldsen | 2010-09-16 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Doc: fixing issues with table indent - css | Morten Engvoldsen | 2010-09-16 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Doc: Fixing style: line height, ol indent, coulmns (css3) | Morten Engvoldsen | 2010-09-16 | 1 | -16/+43 |
| | | | | | |||||
* | | | | | Doc: Fixed qdoc warnings for Phonon documentation. | David Boddie | 2010-09-20 | 1 | -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 Boddie | 2010-09-17 | 2 | -0/+125 |
| |/ / / |/| | | | | | | | | | | | Reviewed-by: Trust Me | ||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-09-16 | 6 | -133/+127 |
|\ \ \ \ | |||||
| * | | | | Doc: Updated What's new in 4.7 page | Geir Vattekar | 2010-09-16 | 1 | -1/+68 |
| |/ / / | | | | | | | | | | | | | Reviewed-by: Henry Haverinen | ||||
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2010-09-16 | 4 | -134/+58 |
| |\ \ \ | |||||
| | * | | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵ | Morten Engvoldsen | 2010-09-16 | 1 | -120/+5 |
| | | | | | | | | | | | | | | | | | | | | resources. | ||||
| | * | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cpp | Jerome Pasion | 2010-09-16 | 2 | -5/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077 | ||||
| | * | | | Doc: Removing section about Multimedia - playback and declarative elements. ↵ | Morten Engvoldsen | 2010-09-16 | 1 | -9/+0 |
| | | | | | | | | | | | | | | | | | | | | This was descoped from Qt 4.7. | ||||
| * | | | | Doc: Updated the Mac requirements page. | Geir Vattekar | 2010-09-16 | 1 | -0/+3 |
| |/ / / | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen | ||||
| * | | | git Merge branch '4.7-upstream' into 4.7-doc | Jesper Thomschutz | 2010-09-15 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp | ||||
| | * | | Revert "Doc: fixing page name bug caused by ↵ | Morten Engvoldsen | 2010-09-10 | 1 | -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.7 | David Boddie | 2010-09-14 | 8 | -270/+347 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2010-09-10 | 100 | -998/+2788 |
| |\ \ \ | |||||
| | * | | | Doc: Added info on compression to rcc docs | Geir Vattekar | 2010-09-10 | 1 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9946 Reviewed-by: David Boddie | ||||
| | * | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-09 | 99 | -997/+2767 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Ignore MAKEFILE variable for Symbian abld and sbsv2 builds. | Miikka Heikkinen | 2010-09-08 | 1 | -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 Pasion | 2010-09-10 | 2 | -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-doc | A-Team | 2010-09-07 | 1 | -54/+55 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7-oslo1' into 4.7-doc | A-Team | 2010-09-07 | 8 | -20/+62 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit 'staging-1/4.7' into doc-4.7 | Morten Engvoldsen | 2010-09-03 | 14 | -410/+367 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7 | Morten Engvoldsen | 2010-09-02 | 3 | -5/+55 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Adding snippet for QML Text element documentation. | Jerome Pasion | 2010-08-31 | 1 | -0/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie Task: QTBUG-13243 | ||||
| | * | | | | | | Fixed spelling, broken links, and missing default values. | Jerome Pasion | 2010-08-30 | 2 | -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 Engvoldsen | 2010-08-31 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | doc-4.7 | ||||
| * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into ↵ | Morten Engvoldsen | 2010-08-30 | 71 | -1693/+3077 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc-4.7 Conflicts: doc/src/getting-started/examples.qdoc doc/src/index.qdoc | ||||
| * | | | | | | | | Fixed the missing snippet. | Jerome Pasion | 2010-08-25 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Small fix. | Jerome Pasion | 2010-08-24 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Cleaned up the install pages. | Jerome Pasion | 2010-08-24 | 1 | -260/+254 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: Morten Engvoldsen | ||||
| * | | | | | | | | Fixed spelling/grammar error. | Jerome Pasion | 2010-08-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: David Boddie Tasks: QTBUG-11926, QTBUG-10174 | ||||
| * | | | | | | | | Fixed ampersand. | Jerome Pasion | 2010-08-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task: QTBUG-12848 | ||||
| * | | | | | | | | Changed "and " to & | Morten Engvoldsen | 2010-08-13 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | small fixes on the modelview tutorial | Roland Wolf | 2010-09-08 | 1 | -11/+19 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Document difference between property binding and assignment | Bea Lam | 2010-09-08 | 2 | -5/+62 |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12629 | ||||
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-09-07 | 4 | -14/+17 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | |