summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-04178-0/+8635
|\ | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-043-173/+289
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Augment documentationAlan Alpert2010-02-032-0/+32
| | | | | | | | | | | | Document automatic signal handlers and QmlViewer.Screen.
| | * doc: Converted the basic types page to use \qmlbasictypeMartin Smith2010-02-031-173/+257
| | | | | | | | | | | | | | | The changes to qdoc3 to support this will be in the 4.7 master branch.
| * | Document calling C++ methods from QML.Martin Jones2010-02-041-0/+95
| |/
| * We use JavaScript, not ECMAScript.Martin Jones2010-02-0312-38/+38
| | | | | | | | Task-number: QTBUG-7720
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-036-8/+28
| |\ | | | | | | | | | into kinetic-declarativeui
| | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-02-026-8/+28
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
| * | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-034-14/+21
| |/ / | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786
| * | 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
| | | | | | | | | | | | | | | | | | Some of the images used in the example and documentation were still with the old graphics. This has been fixed so as to only use the new graphics.
| * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp
| * \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-1917-140/+883
| |\ \ \ \
| * | | | | Doc fixes.Michael Brasser2010-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7322
| * | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-141244-1348/+1471
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7125
| * | | | | | Improve documentationAlan Alpert2010-01-056-18/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend documentation on dynamically created objects and on integrating with existing applications. And make those pages more discoverable.
| * | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| * \ \ \ \ \ \ \ 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 ↵Warwick Allison2009-12-092-8/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | | | | | Link to QML Debugging from index pageBea Lam2009-12-092-8/+9
| | | | | | | | | | |
| * | | | | | | | | | Increase prominence of "QML", since many people know the technology by that ↵Warwick Allison2009-12-092-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name.
| * | | | | | | | | 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-077-24/+37
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| * \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-12-011-12/+12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-301-12/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp
| * | | | | | | | | | | | 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 ↵Warwick Allison2009-11-2765-263/+2207
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| * | | | | | | | | | | | Doc fixAlan Alpert2009-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Thomas Zander
| * | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-261-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-266-20/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | | | | | | | | | Crop whitespace from image.Martin Jones2009-11-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2384
| * | | | | | | | | | | | | | Doc fixesBea Lam2009-11-261-0/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-261-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * | | | | | | | | | | | | Doc.Michael Brasser2009-11-261-0/+17
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | doc fixesBea Lam2009-11-265-20/+31
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-11-2510-42/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * | | | | | | | | | | | Small doc fixes.Martin Jones2009-11-256-10/+10
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-252-20/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: doc/src/declarative/extending.qdoc