summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added content and snippet code to Basic Elements overview page.Jerome Pasion2011-01-074-8/+97
* Re-organized the elements page. Fixed misplaced elements.Jerome Pasion2011-01-061-113/+156
* 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
|\
| * 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
| * | | 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
| * | | 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
| | |\ \
| | | * | Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-204-0/+30
| | | * | Update test bitmaps for QDeclarativeImage::svg() autotest on WindowsJoona Petrell2010-12-202-0/+0
| | | * | Don't truncate image:// url strings prematurelyBea Lam2010-12-203-12/+62
| | | * | 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
| | |\ \
| | | * | Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-201-0/+3
| | |\ \ \ | | | |/ / | | |/| |
| | | * | 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
| * | | 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
* | | | | Adding two QML Best Practice guides.Jerome Pasion2010-12-202-0/+143
* | | | | 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 4.7-integr...Qt Continuous Integration System2010-12-181-1/+7
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-181-1/+7
| | | | |\ \ \ | | | |/ / / /
| | | | * | | Use relative include instead of absolute in default qmake.confMiikka Heikkinen2010-12-171-1/+7
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-171-1/+2
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-1712-36/+120
| | | | |\ \ \ \
| | | | * | | | | Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1711-18/+23
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-175-12/+10
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | | * | | | | Fix QDeclarativeState::reset() autotestJoona Petrell2010-12-173-12/+10
| | | | * | | | | Update test bitmaps for QDeclarativeImage::svg() autotest on LinuxJoona Petrell2010-12-172-0/+0