summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-2528-162/+180
|\
| * Document PackageMartin Jones2010-02-251-0/+1
| * Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView"Aaron Kennedy2010-02-251-10/+0
| * Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlViewAlan Alpert2010-02-241-0/+10
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-242-0/+58
| |\
| * | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-2428-125/+125
| * | docWarwick Allison2010-02-241-1/+1
| * | docWarwick Allison2010-02-241-1/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2423-915/+522
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-2423-915/+522
| | |\ \
| * | \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-234-24/+13
| |\ \ \ \ | | |/ / /
| | * | | Adds QmlEasingValueType to qmlLeonardo Sobral Cunha2010-02-231-6/+6
| | * | | Make QmlBinding (and friends) privateAaron Kennedy2010-02-231-12/+0
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-232-6/+37
| | |\ \ \
| | | * | | Doc.Michael Brasser2010-02-231-6/+6
| | * | | | Add support for setting the root index when using a QAbstractItemModel.Martin Jones2010-02-231-0/+1
| * | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-232-21/+18
| | |/ / / | |/| | |
| * | | | Add documentation on QMLs memory management assumptionsAaron Kennedy2010-02-231-0/+31
| |/ / /
* | | | Doc: fix formattingaavit2010-02-241-22/+22
| |_|/ |/| |
* | | 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
| | |/ / / / / / /