summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-232-0/+58
|\
| * Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2266-1120/+2608
| |\
| * | Use snippets.Aaron McCarthy2010-02-151-0/+49
| * | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-151-0/+9
* | | Merge remote branch 'origin/master'Thiago Macieira2010-02-2316-34/+38
|\ \ \
| * | | Documentation UpdateAlan Alpert2010-02-221-1/+5
| * | | Doc fixAlan Alpert2010-02-221-1/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-2218-35/+35
| |\ \ \ | | |_|/ | |/| |
| | * | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-223-9/+9
| | * | Rename MouseRegion -> MouseAreaMartin Jones2010-02-2215-26/+26
* | | | Merge branch 'master' of git:qt/qtThiago Macieira2010-02-2141-80/+125
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-201-40/+85
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-201-40/+85
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'rtiff392'aavit2010-02-201-39/+78
| | | |\ \
| | | | * | license doc updated for libtiff 3.9.2aavit2010-02-161-39/+78
| | | * | | Merge branch 'rjpeg8'aavit2010-02-201-7/+13
| | | |\ \ \
| | | | * | | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-161-7/+13
| * | | | | | Doc: these files are NOT part of the test suite of the Qt toolkitThiago Macieira2010-02-2046-46/+46
| * | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2010-53/+145
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1856-1059/+2410
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-121-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | doc: Fixed several typos.Martin Smith2010-02-121-1/+1
* | | | | | | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-2010-53/+145
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-199-52/+104
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | docWarwick Allison2010-02-191-2/+5
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1856-1059/+2410
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Doc: reformulate why we build a buttonHenrik Hartz2010-02-181-2/+3
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-182-46/+44
| | |\ \ \ \ \ \ \
| | | * | | | | | | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-182-46/+44
| | * | | | | | | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-181-0/+9
| | |/ / / / / / /
| | * | | | | | | Doc fixAlan Alpert2010-02-171-1/+5
| | * | | | | | | Fix minor doc typoAlan Alpert2010-02-171-1/+1
| | * | | | | | | Document loading QML from Qt resources.Martin Jones2010-02-171-0/+36
| | * | | | | | | Expose LayoutItem documentationAlan Alpert2010-02-161-0/+1
| | * | | | | | | transformOrigin defaults to Center, fix image/docs.Warwick Allison2010-02-161-0/+0
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-1855-1053/+2404
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-15190-19/+8721
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'qt-graphics-team-qstatictext-4.7'Eskil Abrahamsen Blomfeldt2010-02-155-80/+57
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-1522-136/+166
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| * | | | | | | Update license doc and .pri file for libpng 1.4.0aavit2010-02-151-7/+47
| | |/ / / / / | |/| | | | |
* | | | | | | Doc: Collected the Declarative UI tutorials together and renamed them.David Boddie2010-02-1912-777/+498
* | | | | | | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-1911-137/+23
| |_|_|/ / / |/| | | | |
* | | | | | doc: Added "\sa {QML Basic Types} to each QML basic type page.Martin Smith2010-02-171-0/+17
* | | | | | doc: Fixed some qdoc errors.Martin Smith2010-02-167-8/+9
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1640-613/+818
|\ \ \ \ \ \
| * | | | | | Fix copyright year.Jason McDonald2010-02-161-1/+1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Jason McDonald2010-02-167-11/+13
| |\ \ \ \ \ \
| * | | | | | | Fix broken license headers.Jason McDonald2010-02-1639-612/+817
* | | | | | | | doc: Fixed some qdoc errors.Martin Smith2010-02-162-2/+2
| |/ / / / / / |/| | | | | |