summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * | | | | | | | | | | | | 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
| | | | | | * | | | | | | | | | | | Fixed a bug by changing the id name to lower case.Jerome Pasion2010-12-061-1/+1
| | | | | | * | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-03108-2594/+4587
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-026-51/+87
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0115-79/+209
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-3060-341/+1663
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-295-13/+55
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-282-2/+3
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-2730-229/+325
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-2628-217/+978
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | Fixed incorrect angle values in the RotationAnimation description.David Boddie2010-11-301-4/+4
| | | | * | | | | | | | | | | | | | | | | | | | | | doc: Removed some empty \row commands from a table.Martin Smith2010-12-091-3/+0
| | | * | | | | | | | | | | | | | | | | | | | | | | Doc: Fixed doc bug in Diagram Scene exampleGeir Vattekar2010-12-091-1/+1
| | | | |_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Doc:Fix paths in styleplugin/echoplugin .pro filesGeir Vattekar2010-11-262-4/+4
| | | * | | | | | | | | | | | | | | | | | | | | | Doc: Removed two warnings from QDirIterator docsGeir Vattekar2010-11-261-6/+0
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-25143-1340/+6082
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Doc: Fixed whitespace.David Boddie2010-11-251-35/+35
| | | * | | | | | | | | | | | | | | | | | | | | | Doc: Fixed a snippet to show QML comments.David Boddie2010-11-251-1/+0
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-2471-225/+12302
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-240-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-230-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Doc: Added documentation about Tab and Backtab key handling.David Boddie2010-11-241-1/+23
| | | |/ / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-23155-5216/+7595
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-22109-5160/+7250
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Added general statements about reentrancy and thread safety.David Boddie2010-11-231-5/+15
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Removed incorrect statement about the C locale.David Boddie2010-11-221-2/+0
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Fixed broken link by referring to the errors() method instead.David Boddie2010-11-221-3/+4
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-212-0/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | More testing for KeyNavigation attached properties.Martin Jones2010-12-212-0/+45
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-212-0/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for ListView.indexAt() and GridView.IndexAt()Martin Jones2010-12-212-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-202-35/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | runonphone: Only print the modprobe instructions on linuxMartin Storsjo2010-12-201-0/+4
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | reword: Make the USB serial device enumeration work on OS X, tooMartin Storsjo2010-12-201-4/+19
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | runonphone: Check that the device->config is valid before dereferencing itMartin Storsjo2010-12-201-1/+1
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove few compile warningsMiikka Heikkinen2010-12-201-2/+2
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix using QFileDialog statics in Symbian.Miikka Heikkinen2010-12-201-28/+41
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2010-12-2327-0/+77355
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2010-12-2227-0/+77355
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added initial set of build related files for SymbianEckhart Koppen2010-12-2227-0/+77355
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-2112-702/+390
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed PREPEND_INCLUDEPATH being executed too early.axis2010-12-213-16/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-12-2110-701/+390
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'nonQtApps-fix' and 'merge-request-2516' into master-s60axis2010-12-2010-701/+390
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |