summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* 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' into qt-master-from-4.6Thiago Macieira2010-02-13179-2/+8700
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-10179-2/+8700
| |\ \ \
| | * | | Document QtObjectAlan Alpert2010-02-082-1/+2
| | * | | Better documentation of "model" and "modelData" in delegates.Martin Jones2010-02-081-5/+63
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05179-2/+8641
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05179-2/+8641
| | | |\ \ \
| | | | * | | Document QmlContext ownership.Martin Jones2010-02-041-1/+4
| | | | * | | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-04179-2/+8638
| | | | |\ \ \
| | | | | * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-02-043-173/+289
| | | | | |\ \ \
| | | | | | * | | Augment documentationAlan Alpert2010-02-032-0/+32
| | | | | | * | | doc: Converted the basic types page to use \qmlbasictypeMartin Smith2010-02-031-173/+257
| | | | | * | | | Document calling C++ methods from QML.Martin Jones2010-02-041-0/+95
| | | | | |/ / /
| | | | | * | | We use JavaScript, not ECMAScript.Martin Jones2010-02-0312-38/+38
| | | | | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2010-02-036-8/+28
| | | | | |\ \ \
| | | | | | * \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-026-8/+28
| | | | | | |\ \ \
| | | | | * | | | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-034-14/+21
| | | | | |/ / / /
| | | | | * | | | Fix QList<QObject*> as a model. Add docs and example.Martin Jones2010-02-011-5/+52
| | | | | * | | | Update advanced tutorial with new imagesAlan Alpert2010-02-014-1/+3
| | | | | * | | | Document possibility of -1 index in delegate.Martin Jones2010-01-291-0/+7
| | | | | * | | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-274-6/+6
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-202-2/+2
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-1917-140/+883
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | Doc fixes.Michael Brasser2010-01-151-1/+1
| | | | | * | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-141244-1348/+1471
| | | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | | Allow QML types defined in both C++ and QML files to be in the same module.Warwick Allison2010-01-081-1/+4
| | | | | * | | | | | | | docWarwick Allison2010-01-082-18/+59
| | | | | * | | | | | | | Improve documentationAlan Alpert2010-01-056-18/+220
| | | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-051-1/+1
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Add documentation for integrating with existing Qt UI codeAlan Alpert2009-12-302-1/+92
| | | | | * | | | | | | | | Doc fixAlan Alpert2009-12-181-2/+2
| | | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-176-57/+117
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-102-10/+10
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Add simple translation example to docs.Michael Brasser2009-12-091-0/+29
| | | | | * | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-12-092-8/+9
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Link to QML Debugging from index pageBea Lam2009-12-092-8/+9
| | | | | * | | | | | | | | | | | Increase prominence of "QML", since many people know the technology by that n...Warwick Allison2009-12-092-2/+2
| | | | | |/ / / / / / / / / / /
| | | | | * | | | | | | | | | | Add info about qmldebugger and its creator plugin, with screenshot.Bea Lam2009-12-082-2/+51
| | | | | * | | | | | | | | | | Add barebones debugging documentation.Michael Brasser2009-12-082-1/+72
| | | | | * | | | | | | | | | | Add barebones i18n documentation.Michael Brasser2009-12-083-0/+68
| | | | | * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-4/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-077-24/+37
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-12-011-12/+12
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-301-12/+12
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | doc fixBea Lam2009-11-301-1/+1
| | | | | |/ / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | DocAaron Kennedy2009-11-301-2/+2
| | | | | * | | | | | | | | | | | | | DocAaron Kennedy2009-11-271-9/+1
| | | | | * | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-2765-263/+2207
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \