summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13179-2/+8700
|\ | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-10179-2/+8700
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits) Expect fail. Expect fails. Attempt to clairify highlight range docs Make sure item release isn't deferred indefinately Expect fail. Missing file Exclude plugins example in test. Test Crash Fix tests Compile. Remove pathview test. Remove unneeded Fix repeater test. Revert "Remove unimplemented methods from header" Revert "Replace QList<>* support with QmlListProperty" Revert "Compile" Add expected fail and created QTBUG-8072 for qml animation auto-test Fix expected error message. Consolidate the two pathview tests and fix them all. ...
| | * Document QtObjectAlan Alpert2010-02-082-1/+2
| | | | | | | | | | | | Task-number:QTBUG-6034
| | * Better documentation of "model" and "modelData" in delegates.Martin Jones2010-02-081-5/+63
| | | | | | | | | | | | Task-number: QTBUG-6396
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-05179-2/+8641
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits) Fix test. Remove hacky fix (breaks autotest). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. Test fixes. More test fixes. Clean up QmlImageReader thread on engine destruction. Update test to handle QmlNetworkAccessManagerFactory Test fixes. Add a QEXPECT_FAIL for known bug. Fix autotest. Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. ...
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-05179-2/+8641
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| | | | * Document QmlContext ownership.Martin Jones2010-02-041-1/+4
| | | | |
| | | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-04179-2/+8638
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-4/+1
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ 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
generated by cgit v0.12 at 2025-01-06 06:47:57 (GMT)