Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
| * | | | 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 ../qt-doc-team into 4.7 | David Boddie | 2010-09-14 | 8 | -270/+347 |
| |\ \ \ \ | |||||
| * | | | | | small fixes on the modelview tutorial | Roland Wolf | 2010-09-08 | 1 | -11/+19 |
| | | | | | | |||||
* | | | | | | 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 |
| |_|/ / / |/| | | | | |||||
* | | | | | 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 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 | ||||
| | * | | 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 |
| | |\ | |||||
| | * \ | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-07 | 5 | -28/+55 |
| | |\ \ | |||||
| | * | | | Doc: More work on the QML documentation. | David Boddie | 2010-09-07 | 12 | -65/+407 |
| | | | | | |||||
| | * | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-06 | 6 | -0/+60 |
| | |\ \ \ | |||||
| | * | | | | Doc: Worked on two more elements, replacing an image. | David Boddie | 2010-09-06 | 3 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-03 | 5 | -78/+29 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml | ||||
| | * | | | | | Doc: qdoc fixes. | David Boddie | 2010-09-02 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Doc: Fixed autotest breakage caused by snippets. | David Boddie | 2010-09-01 | 13 | -16/+124 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-01 | 5 | -317/+287 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp | ||||
| | * | | | | | | Doc: More work on QML documentation and snippets. | David Boddie | 2010-09-01 | 6 | -1/+80 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-08-27 | 7 | -0/+47 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Doc: Fixed links and markup. | David Boddie | 2010-08-27 | 1 | -5/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Doc: More work on the QML documentation. | David Boddie | 2010-08-27 | 26 | -5/+692 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch '4.7' into qmldocs | David Boddie | 2010-08-24 | 31 | -43/+375 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Doc: Minor improvements and fixes. | David Boddie | 2010-08-24 | 2 | -5/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Doc: Started to improve QML reference documentation. | David Boddie | 2010-08-23 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Doc: Moved the inline code into snippet files. | David Boddie | 2010-08-23 | 1 | -57/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Doc: Started to reorganize the QML documentation structure. | David Boddie | 2010-08-23 | 1 | -30/+67 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Doc: Used snippets for the Beginning QML document. License update. | David Boddie | 2010-08-23 | 18 | -13/+715 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Doc: Updated QML snippets. | David Boddie | 2010-08-23 | 2 | -5/+5 |
| | | | | | | | | | |