summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Try fixing build error on WindowsBea Lam2010-12-231-1/+1
* Ensure PathView doesn't jump when starting to drag.Martin Jones2010-12-2317-520/+524
* Nested flickables would react alternately to flicks.Martin Jones2010-12-239-2/+2213
* Improve QDeclarativeComponent test coverage.Michael Brasser2010-12-223-12/+15
* Add additional QDeclarativeProperty autotests.Michael Brasser2010-12-221-0/+62
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-224-5/+82
|\
| * Removing all visible items in ListView resulted in blank view.Martin Jones2010-12-222-5/+12
| * XmlListModel requests should set 'Accept' header to 'application/xml'Bea Lam2010-12-222-0/+70
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-222-2/+12
|\ \
| * | Fix infinite loop in qmake when reading malformed .ts files.Miikka Heikkinen2010-12-221-1/+1
| * | Fix libinfixed usage in Symbian when def files are usedMiikka Heikkinen2010-12-221-1/+11
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-222-28/+109
|\ \ \
| * | | Made documentation of QPixmap::createMaskFromColor match behaviour.Samuel Rødal2010-12-221-2/+2
| * | | Improve performance of bilinear downscaling of images with neon.Samuel Rødal2010-12-221-26/+107
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-223-93/+107
|\ \ \ | |/ / |/| / | |/
| * Document the 'variant' basic typeBea Lam2010-12-222-12/+87
| * Add double type to QML Basic Types docsBea Lam2010-12-221-0/+20
| * Remove redundant docsBea Lam2010-12-221-81/+0
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-2152-3464/+1943
|\
| * Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-15105-3511/+2294
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1428-85/+286
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1342-157/+802
| | |\ \
| | * | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-82/+30
| | * | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-138-2692/+768
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-1328-187/+345
| | |\ \ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-111-0/+7
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-1016-174/+276
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0910-12/+61
| | | |\ \ \ \ \
| | * | | | | | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-336/+91
| * | | | | | | | Doc: Added a note about the Public Suffix List.David Boddie2010-12-101-30/+51
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-12-09293-3887/+9136
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-09995-21006/+43207
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0822-76/+314
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-088-24/+78
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-073-4/+18
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Doc: Added missing What's New information for Qt 4.6 and 4.7.David Boddie2010-12-072-12/+58
| | | | * | | | | | | | Doc: Fixed incorrect case in a page file name.David Boddie2010-12-071-1/+1
| | | | * | | | | | | | Doc: Added a link to the QML Basic Types page.David Boddie2010-12-071-0/+1
| | | | * | | | | | | | Doc: Removed duplicate external page reference.David Boddie2010-12-071-5/+0
| | | | * | | | | | | | Doc: Fixed a link to the correct searchPaths() function.David Boddie2010-12-071-1/+1
| | | | * | | | | | | | Doc: Added documentation about the use of null custom title bar widgets.David Boddie2010-12-071-5/+12
| | | | * | | | | | | | Doc: Added a missing external page reference.David Boddie2010-12-071-0/+5
| | | * | | | | | | | | Doc: Added link to QML Basic Types in main Qt Quick page.Jerome Pasion2010-12-081-0/+1
| | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-063-4/+18
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-06399-5118/+14799
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0617-219/+713
| | | | * | | | | | | | Added QML coding convention for "private" properties.Jerome Pasion2010-12-062-3/+64
| | | | * | | | | | | | Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-062-15/+24
| | | | * | | | | | | | Some whitespace fixes.Jerome Pasion2010-12-061-32/+32