Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rewrote QML Property Binding document. Added snippet code. | Jerome Pasion | 2011-01-13 | 3 | -254/+630 |
| | | | | Task-number: QTBUG-16071 | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-13 | 1 | -4/+9 |
|\ | |||||
| * | Doc: correcting merge error | Morten Engvoldsen | 2011-01-12 | 1 | -4/+9 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-07 | 0 | -0/+0 |
|\ \ | |/ | | | | | | | | | | | Resolved link merge. Conflicts: doc/src/qt-webpages.qdoc | ||||
| * | Adding a link to the coding style wiki page. | Jerome Pasion | 2011-01-07 | 1 | -0/+5 |
| | | |||||
* | | Added content and snippet code to Basic Elements overview page. | Jerome Pasion | 2011-01-07 | 4 | -8/+97 |
| | | | | | | | | Task-number: QTBUG-16071 | ||||
* | | Re-organized the elements page. Fixed misplaced elements. | Jerome Pasion | 2011-01-06 | 1 | -113/+156 |
| | | | | | | | | Task-number: QTBUG-16071 | ||||
* | | Fixed merge conflict | Jerome Pasion | 2011-01-05 | 1 | -4/+0 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-05 | 50 | -793/+1509 |
|\ \ | |/ | | | | | Merging qt-doc-team into cloned repository | ||||
| * | Doc: Sync with upstream. | David Boddie | 2010-12-22 | 1 | -1/+1 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-21 | 6 | -15/+9 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-21 | 6 | -44/+44 |
| | |\ | |||||
| | * | | Doc: Changed a page title. | David Boddie | 2010-12-21 | 5 | -6/+6 |
| | | | | |||||
| | * | | Doc: Updated the HarfBuzz license information. | David Boddie | 2010-12-21 | 1 | -9/+3 |
| | | | | | | | | | | | | | | | | As-requested-by: Legal | ||||
| * | | | Doc: Fixed QML syntax in quoted code snippets. | David Boddie | 2010-12-21 | 4 | -24/+67 |
| | | | | |||||
| * | | | Merge branch 'qdoc-simplified' into 4.7 | David Boddie | 2010-12-21 | 10 | -25/+39 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Enabled error reporting and a plain text fallback for invalid QML. | David Boddie | 2010-12-21 | 10 | -25/+39 |
| | | | | | | | | | | | | | | | | | | | | The location of places where code is included in documentation is now passed into each code marker when highlighted code is needed. | ||||
| * | | | Merge branch 'qdoc-simplified' into 4.7 | David Boddie | 2010-12-21 | 6 | -44/+44 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Doc: Updated the Qt version number. | David Boddie | 2010-12-21 | 1 | -4/+4 |
| | | | |||||
| | * | Doc: Fixed whitespace. | David Boddie | 2010-12-21 | 3 | -11/+11 |
| | | | |||||
| | * | Doc: Fixed whitespace. | David Boddie | 2010-12-21 | 2 | -29/+29 |
| | | | |||||
| * | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-20 | 13 | -14/+101 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-12-20 | 11 | -13/+97 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Setting TextInput.cursorPosition outside bounds crashed. Update test bitmaps for QDeclarativeImage::svg() autotest on Windows Don't truncate image:// url strings prematurely Update docs on importing javascript files | ||||
| | | * | | Setting TextInput.cursorPosition outside bounds crashed. | Martin Jones | 2010-12-20 | 4 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check bounds in TextInput and TextEdit. Task-number: QTBUG-16188 Reviewed-by: Bea Lam | ||||
| | | * | | Update test bitmaps for QDeclarativeImage::svg() autotest on Windows | Joona Petrell | 2010-12-20 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones | ||||
| | | * | | Don't truncate image:// url strings prematurely | Bea Lam | 2010-12-20 | 3 | -12/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Url fragments and queries were being removed from the image ids passed to QDeclarativeImageProvider. Task-number: QTBUG-16195 Reviewed-by: Martin Jones | ||||
| | | * | | Update docs on importing javascript files | Bea Lam | 2010-12-20 | 2 | -1/+5 |
| | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-12-20 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix deployment of minehunt for Symbian | ||||
| | | * | | Fix deployment of minehunt for Symbian | Damian Jansen | 2010-12-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Task: QT-4298 | ||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2010-12-20 | 1 | -0/+3 |
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Quiet unused parameter warnings. | ||||
| | | * | | Quiet unused parameter warnings. | Aaron McCarthy | 2010-12-20 | 1 | -0/+3 |
| | |/ / | |||||
| * | | | Merge branch 'qdoc-simplified' into 4.7 | David Boddie | 2010-12-20 | 2 | -30/+27 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fixed handling of indented snippet markers. | David Boddie | 2010-12-20 | 2 | -30/+27 |
| | | | | | | | | | | | | | | | | Refactored the code to remove namespace macros and snippet markers. | ||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-20 | 33 | -83/+229 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Removed obsolete configuration options. | David Boddie | 2010-12-17 | 2 | -10/+0 |
| | | | | |||||
| * | | | Updated the offline template to use a new offline style sheet. | David Boddie | 2010-12-17 | 3 | -17/+672 |
| | | | | |||||
| * | | | Doc: Fixed whitespace. | David Boddie | 2010-12-17 | 1 | -61/+14 |
| | | | | |||||
| * | | | Doc: Fixed broken links. | David Boddie | 2010-12-17 | 3 | -12/+10 |
| | | | | |||||
| * | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-17 | 11 | -65/+171 |
| |\ \ \ | |||||
| * | | | | Whitespace fixes. | David Boddie | 2010-12-17 | 2 | -554/+534 |
| | | | | | |||||
* | | | | | Re-organized the Qt Quick page. Changed titles and links. | Jerome Pasion | 2010-12-20 | 41 | -868/+1428 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071 | ||||
* | | | | | Adding two QML Best Practice guides. | Jerome Pasion | 2010-12-20 | 2 | -0/+143 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15757 | ||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2010-12-20 | 252 | -14504/+8818 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2010-12-20 | 13 | -20/+32 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-18 | 2 | -2/+9 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Qt Continuous Integration System | 2010-12-18 | 1 | -1/+7 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use relative include instead of absolute in default qmake.conf | ||||
| | | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | Qt Continuous Integration System | 2010-12-18 | 1 | -1/+7 |
| | | | |\ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use relative include instead of absolute in default qmake.conf | ||||
| | | | * | | | Use relative include instead of absolute in default qmake.conf | Miikka Heikkinen | 2010-12-17 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absolute include path breaks QtP releases which copy mkspecs under epoc32 and do not necessarily have the sources available in the original absolute path and can't patch the paths either at installation time. Task-number: QTBUG-16172 Reviewed-by: Oswald Buddenhagen | ||||
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2010-12-17 | 1 | -1/+2 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix waitForOpened not working with already active configuration | ||||
| | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Ville Pernu | 2010-12-17 | 12 | -36/+120 |
| | | | |\ \ \ \ |