summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix for compilation with namespaceRoland Wolf2010-09-082-2/+2
* minor formatting fixRoland Wolf2010-09-082-2/+2
* fix for compilation with namespaceRoland Wolf2010-09-084-6/+22
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-085-18/+89
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-08149-1605/+3663
| |\
| | * Document difference between property binding and assignmentBea Lam2010-09-082-5/+62
| | * Remove unused objectBea Lam2010-09-081-1/+0
| | * Fix Worker ListModel to emit the right signal when items changeBea Lam2010-09-081-1/+1
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-08115-1396/+3366
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0723-133/+169
| |\ \
| * \ \ Merge branch '4.7' into qmldocsDavid Boddie2010-09-0786-1657/+4605
| |\ \ \
| * | | | Doc: More work on the QML documentation.David Boddie2010-09-0716-116/+502
| * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0643-335/+549
| |\ \ \ \
| * | | | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-065-36/+93
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0389-634/+2028
| |\ \ \ \ \
| * | | | | | Doc: qdoc fixes.David Boddie2010-09-023-7/+7
| * | | | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-018-49/+58
| * | | | | | Doc: Fixed autotest breakage caused by snippets.David Boddie2010-09-0113-16/+124
| * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-01218-3869/+8160
| |\ \ \ \ \ \
| * | | | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-017-6/+86
| * | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-27206-558/+5907
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Fixed links and markup.David Boddie2010-08-271-5/+5
| * | | | | | | | Doc: More work on the QML documentation.David Boddie2010-08-2729-209/+955
| * | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-24201-17039/+16767
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Minor improvements and fixes.David Boddie2010-08-242-5/+5
| * | | | | | | | | Doc: Fixed incorrect use of commands to mark documentation.David Boddie2010-08-233-3/+1
| * | | | | | | | | Doc: Started to improve QML reference documentation.David Boddie2010-08-234-63/+152
| * | | | | | | | | Doc: Moved the inline code into snippet files.David Boddie2010-08-231-57/+10
| * | | | | | | | | Doc: Started to reorganize the QML documentation structure.David Boddie2010-08-231-30/+67
| * | | | | | | | | Doc: Used snippets for the Beginning QML document. License update.David Boddie2010-08-2318-13/+715
| * | | | | | | | | Doc: Updated QML snippets.David Boddie2010-08-232-5/+5
| * | | | | | | | | Doc: Updated licenses to the three clause BSD license.David Boddie2010-08-2326-730/+704
| * | | | | | | | | Doc: Made more improvements to the QML documentation.David Boddie2010-08-2316-80/+612
| * | | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-17337-14658/+17498
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Doc: Started work to tidy up existing QML docs.David Boddie2010-08-1718-26/+409
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-076-12/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Remove unnecessary function declarations from qpixmap_s60_p.hJani Hautakangas2010-09-071-5/+0
| * | | | | | | | | | Fix text size issues for high ppi displaysAlessandro Portale2010-09-075-7/+7
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-073-57/+58
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0786-1657/+4605
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Always call QPainter::end() before using the object drawn to.Trond Kjernåsen2010-09-071-1/+1
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0643-335/+549
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0289-632/+2028
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-01232-3729/+9103
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-27206-558/+5907
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-24201-17040/+16767
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-17336-14656/+17496
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Doc: Reworded a brief description for clarity.David Boddie2010-08-171-2/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Doc: Added a small note about using .pro files in SUBDIRS.David Boddie2010-08-171-54/+55
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-073-8/+16
|\ \ \ \ \ \ \ \ \ \