Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainline/4.7' into 4.7 | Morten Johan Sørvig | 2010-05-12 | 43 | -256/+449 |
|\ | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tools/qdoc3/htmlgenerator.cpp | ||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-07 | 3 | -7/+19 |
| |\ | | | | | | | | | | | | | Conflicts: examples/declarative/dynamic/qml/itemCreation.js | ||||
| | * | qdoc fixes. | Yann Bodson | 2010-05-06 | 1 | -0/+11 |
| | | | |||||
| | * | Cleanup | Yann Bodson | 2010-05-06 | 1 | -0/+1 |
| | | | |||||
| | * | Use enum for drag.axis in doc and examples. | Yann Bodson | 2010-05-06 | 1 | -1/+1 |
| | | | |||||
| | * | doc fixes | Yann Bodson | 2010-05-06 | 1 | -6/+6 |
| | | | |||||
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-05-05 | 5 | -29/+89 |
| |\ \ | | |/ | |||||
| | * | Docs - point to property types from tutorial and QML Basic Types page | Bea Lam | 2010-05-05 | 2 | -10/+13 |
| | | | |||||
| | * | Fix qdoc errors | Bea Lam | 2010-05-05 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-05-05 | 3 | -16/+66 |
| | |\ | |||||
| | | * | Allow translations without extra command-line args, and document both. | Warwick Allison | 2010-05-05 | 1 | -0/+17 |
| | | | | |||||
| | | * | Doc improvements, simplify example code | Bea Lam | 2010-05-05 | 2 | -16/+49 |
| | | | | |||||
| | * | | QList<QObject*> models now update their properties when they change. | Martin Jones | 2010-05-05 | 1 | -2/+9 |
| | |/ | | | | | | | | | | Task-number: QTBUG-10348 | ||||
| * | | Make component.createObject require a parent argument | Alan Alpert | 2010-05-05 | 4 | -10/+10 |
| |/ | | | | | | | | | | | | | | | | | For graphical objects (the common case) a common mistake is to not parent a dynamically created item. Since you almost always want to add a parent, and it's hard for a beginner to diagnose this problem, a parent is now a required argument and dealt with by the createObject function. Task-number: QTBUG-10110 | ||||
| * | Doc improvements | Bea Lam | 2010-05-04 | 3 | -30/+74 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Warwick Allison | 2010-05-04 | 7 | -23/+1028 |
| |\ | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp | ||||
| * | | Add Qt.fontFamilies() method | Aaron Kennedy | 2010-04-30 | 1 | -0/+3 |
| | | | | | | | | | | | | QTBUG-10239 | ||||
| * | | More doc fixes | Bea Lam | 2010-04-30 | 1 | -10/+4 |
| | | | |||||
| * | | Doc fixes | Bea Lam | 2010-04-30 | 4 | -94/+101 |
| | | | |||||
| * | | Allow factor parameter to be passed to Qt.lighter() and Qt.darker() | Martin Jones | 2010-04-29 | 1 | -4/+27 |
| | | | |||||
| * | | Remove Component's isReady, isLoading, isError and isNull properties. | Bea Lam | 2010-04-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | The Component status enum covers all of these properties already and removing these also makes the API consistent with Image and Loader. Note this change only affects the QML Component API; the methods are still available for QDeclarativeComponent. | ||||
| * | | Fix references to createComponent() and createQmlObject() to | Bea Lam | 2010-04-28 | 7 | -109/+151 |
| | | | | | | | | | | | | | | | Qt.createComponent() and Qt.createQmlObject(). Also move code into snippets/ for verification. | ||||
| * | | Move snippets to correct location | Bea Lam | 2010-04-28 | 25 | -19/+19 |
| | | | |||||
| * | | Doc fixes | Bea Lam | 2010-04-28 | 1 | -3/+11 |
| | | | |||||
* | | | Doc: Fixed tables and images for the new docs | Morten Engvoldsen | 2010-05-11 | 4 | -20/+40 |
| | | | | | | | | | | | | | | | Added page.png to images dir. Fixed tables "generic" | ||||
* | | | qdoc: Yet another revision of the top doc page. | Martin Smith | 2010-05-11 | 12 | -19/+34 |
| | | | | | | | | | | | | Still more to come. | ||||
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-05-10 | 2 | -4/+13 |
|\ \ \ | |||||
| * | | | Doc correction to css | Morten Engvoldsen | 2010-05-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen | ||||
| * | | | Doc: Updates to the html template and javascript | Morten Engvoldsen | 2010-05-10 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen | ||||
* | | | | qdoc: Another revision of the top doc page. | Martin Smith | 2010-05-10 | 3 | -40/+26 |
|/ / / | | | | | | | | | | More to come. | ||||
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Morten Engvoldsen | 2010-05-07 | 2 | -3/+94 |
|\ \ \ | |||||
| * \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-05-07 | 2 | -7/+29 |
| |\ \ \ | |||||
| * | | | | qdoc: Reorganized examples panel. | Martin Smith | 2010-05-07 | 2 | -3/+94 |
| | | | | | |||||
* | | | | | Doc: Tuning search script | Morten Engvoldsen | 2010-05-07 | 1 | -6/+6 |
| |/ / / |/| | | | | | | | | | | | Reviewed-by: Morten Engvoldsen | ||||
* | | | | Doc: Chages to search feature, css and table order | Morten Engvoldsen | 2010-05-07 | 2 | -7/+29 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | Changes the search results Fixed table css Added odd&even classes to tables generated by the thmlgenerator Reviewed-by: Morten Engvoldsen | ||||
* | | | Doc: updating html and search feature | Morten Engvoldsen | 2010-05-06 | 2 | -221/+89 |
| | | | | | | | | | | | | | | | | | | Doc: implementing the search feature in the online docs Reviewed-by: Morten Engvoldsen | ||||
* | | | Doc - mention vcsubdirs as a possible value for TEMPLATE | Simon Hausmann | 2010-05-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | It is usually the result of using subdirs in the .pro file and then using -tp vc to turn it into vcsubdirs. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
* | | | doc: Second attempt to begin reorganizing the top doc page. | Martin Smith | 2010-05-06 | 4 | -4/+14 |
| | | | | | | | | | | | | This change actually changes the left panels. Much more to come. | ||||
* | | | Doc: Changes to the HTML output | Morten Engvoldsen | 2010-05-05 | 2 | -62/+58 |
| | | | | | | | | | | | | | | | | | | Changes in css, htmlgenerator (removing redundant class names), updating html templates and updating js. Reviewed-by: Morten Engvoldsen | ||||
* | | | doc: Began reorganization of the top doc page. | Martin Smith | 2010-05-05 | 17 | -6/+45 |
| | | | | | | | | | | | | Much more to come. | ||||
* | | | Doc: Updating style and HTML in CSS and qdoc | Morten Engvoldsen | 2010-05-04 | 1 | -11/+85 |
| | | | | | | | | | | | | | | | | | | Adding all classnames generated in qdoc to the CSS and removing redundant from htmlgenerator. Reviewed-by: Trust Me | ||||
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-05-04 | 5 | -0/+836 |
|\ \ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-05-04 | 1 | -28/+28 |
| |\ \ \ | |||||
| * | | | | Doc: Fixed up the diagrams, aligning items with a grid. | David Boddie | 2010-05-04 | 4 | -101/+101 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | | Merge commit 'refs/merge-requests/2379' of git://gitorious.org/qt/qt into ↵ | David Boddie | 2010-05-04 | 5 | -0/+836 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | integration | ||||
| | * | | | | Add diagrams for illustrating the process of moving rows. | Stephen Kelly | 2010-05-03 | 5 | -0/+836 |
| | | | | | | |||||
* | | | | | | qdoc: Fixed the alphabet index in the compact list. | Martin Smith | 2010-05-04 | 1 | -4/+4 |
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Now it leaves out any letter that doesn't appear in the list. i.e. If there are no classes that begin with QJ... J does not appear in the alphabet index. | ||||
* | | | | | doc: Edited the intro. | Martin Smith | 2010-05-04 | 31 | -390/+684 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Morten Engvoldsen | 2010-05-04 | 2 | -26/+26 |
| |\ \ \ \ | |||||
| * | | | | | Doc: A number of fixes and updates for the new design. See details | Morten Engvoldsen | 2010-05-04 | 31 | -122/+298 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index.qdoc updated the HTML to use sprites images - deleted obsolete images from templates/images images - added new images to templates/images styles.css - updated styles to handle index, sprites and templates correct. assistant.qdoconf - updates images designer.qdoconf - updates images linguist.qdoconf - updates images declarative.qdoconf - updates images qmake.qdoconf - updates images qt-build-docs.qdoconf - updates images qt-build-docs_zh_CN.qdoconf - updates images qt-defines.qdoconf - updates images qt.qdoconf - updates images qt_zh_CN.qdoconf - updates images qt-htmlTemplates.qdoconf - updated template to use sprites declarativeui.qdoc - removed <br> Reviewed-by: Trust Me |