summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rewrote QML Property Binding document. Added snippet code.Jerome Pasion2011-01-133-254/+630
| | | | Task-number: QTBUG-16071
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-131-4/+9
|\
| * Doc: correcting merge errorMorten Engvoldsen2011-01-121-4/+9
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-070-0/+0
|\ \ | |/ | | | | | | | | | | Resolved link merge. Conflicts: doc/src/qt-webpages.qdoc
| * Adding a link to the coding style wiki page.Jerome Pasion2011-01-071-0/+5
| |
* | Added content and snippet code to Basic Elements overview page.Jerome Pasion2011-01-074-8/+97
| | | | | | | | Task-number: QTBUG-16071
* | Re-organized the elements page. Fixed misplaced elements.Jerome Pasion2011-01-061-113/+156
| | | | | | | | Task-number: QTBUG-16071
* | Fixed merge conflictJerome Pasion2011-01-051-4/+0
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-0550-793/+1509
|\ \ | |/ | | | | Merging qt-doc-team into cloned repository
| * Doc: Sync with upstream.David Boddie2010-12-221-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-216-15/+9
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-216-44/+44
| | |\
| | * | Doc: Changed a page title.David Boddie2010-12-215-6/+6
| | | |
| | * | Doc: Updated the HarfBuzz license information.David Boddie2010-12-211-9/+3
| | | | | | | | | | | | | | | | As-requested-by: Legal
| * | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-214-24/+67
| | | |
| * | | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-2110-25/+39
| |\ \ \ | | |_|/ | |/| |
| | * | Enabled error reporting and a plain text fallback for invalid QML.David Boddie2010-12-2110-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.7David Boddie2010-12-216-44/+44
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Doc: Updated the Qt version number.David Boddie2010-12-211-4/+4
| | |
| | * Doc: Fixed whitespace.David Boddie2010-12-213-11/+11
| | |
| | * Doc: Fixed whitespace.David Boddie2010-12-212-29/+29
| | |
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-2013-14/+101
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-2011-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 Jones2010-12-204-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check bounds in TextInput and TextEdit. Task-number: QTBUG-16188 Reviewed-by: Bea Lam
| | | * | Update test bitmaps for QDeclarativeImage::svg() autotest on WindowsJoona Petrell2010-12-202-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | | * | Don't truncate image:// url strings prematurelyBea Lam2010-12-203-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 filesBea Lam2010-12-202-1/+5
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-201-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix deployment of minehunt for Symbian
| | | * | Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | Task: QT-4298
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-201-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 McCarthy2010-12-201-0/+3
| | |/ /
| * | | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-202-30/+27
| |\ \ \ | | | |/ | | |/|
| | * | Fixed handling of indented snippet markers.David Boddie2010-12-202-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.7David Boddie2010-12-2033-83/+229
| |\ \ \ | | |/ / | |/| |
| * | | Removed obsolete configuration options.David Boddie2010-12-172-10/+0
| | | |
| * | | Updated the offline template to use a new offline style sheet.David Boddie2010-12-173-17/+672
| | | |
| * | | Doc: Fixed whitespace.David Boddie2010-12-171-61/+14
| | | |
| * | | Doc: Fixed broken links.David Boddie2010-12-173-12/+10
| | | |
| * | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1711-65/+171
| |\ \ \
| * | | | Whitespace fixes.David Boddie2010-12-172-554/+534
| | | | |
* | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-2041-868/+1428
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
* | | | | Adding two QML Best Practice guides.Jerome Pasion2010-12-202-0/+143
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15757
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-20252-14504/+8818
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-2013-20/+32
| |\ \ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-182-2/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-181-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 System2010-12-181-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.confMiikka Heikkinen2010-12-171-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 System2010-12-171-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.7Ville Pernu2010-12-1712-36/+120
| | | | |\ \ \ \