summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Changes to the HTMLGenerator, style and jsMorten Engvoldsen2010-05-2112-11/+20
| | | | | | Replacing tables with lists in the HTML generator Adding img to search box Moving JS from template to script files
* use qtPrepareTool for qdocOswald Buddenhagen2010-05-201-14/+1
| | | | Reviewed-by: joerg
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-203-10/+8
|\
| * Doc: Updating CSS and JSMorten Engvoldsen2010-05-201-8/+6
| | | | | | | | Fixed bugs on index page, moved JS from template to script file.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits) Search for QML import libraries also in application directory Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer Don't crash if the target parent is destroyed. Introduce a threaded interpreter for QML binding bytecode Bug moved. doc doc Remove image example (covered in class docs) When changing Loader source, remove old item from scene immediately. Add missing .qmlproject files Fix folderlistmodel with qt namespace Renaming "Qml Launcher" back to "QML Viewer" Rename some examples: proxyviewer -> networkaccessmanagerfactory, Regression fix for Loader anchors not working Make Qt.include() work for js files that have '.pragma library' doc fix Improve docs for Qt.quit() Prevent assignment of values (string, number, bool) to signal handlers. ...
| | * Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change the official name of the qml executable back to "Qt QML Viewer" - the original name before it got renamed to "QML Runtime" and then "QML Launcher". Also, the new Mac OS X bundle name is "QMLViewer" (without a space to ease command line use).
| * | qdoc: Set back to 3 cols for class list; we have a scrollbar now.Martin Smith2010-05-191-1/+1
| | |
* | | qdoc: Propagate the language information into the XML as before.David Boddie2010-05-201-1/+1
|/ / | | | | | | Reviewed-by: Trust Me
* | Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-1810-2/+45
|/ | | | Fixing index page bugs
* Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-141-0/+1
| | | | | | | | The qml executable was first referred to as QML Viewer, then QML Runtime ... however, the latter one caused much confusion (see old version of qmlruntime.qdoc). Doc changes reviewed by Leena Miettinen.
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-121-9/+1
|\
| * Merge remote branch 'mainline/4.7' into 4.7Morten Johan Sørvig2010-05-121-9/+1
| |\ | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tools/qdoc3/htmlgenerator.cpp
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-05-046-10/+72
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-281-8/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (21 commits) Improve border image documentation. Update border image examples. Doc - micro fix. Fix QML default property HTML generation... again. Alpha needs to be part of rectangle cache key. Bunch of doc fixes. Doc: overview for Image Code cleanup Remove unused variable Don't test snippets with C++ components Don't unnecessarily regenerate property cache Share Rectangle pixmap caches between items. Move snippets to correct location Make compile Benchmark Small cleanups Fix snap at view boundaries with overshoot on. Doc fixes Emit hoverChanged appropriately when Item visibility changes. Delete canvas after use in positioner unit tests ...
| | | * | Fix QML default property HTML generation... again.Martin Jones2010-04-281-8/+0
| | | | |
* | | | | Doc: Adding loading image to search textboxMorten Engvoldsen2010-05-121-3/+3
|/ / / /
* | | | Doc: Update on web templateMorten Engvoldsen2010-05-111-1/+1
| | | | | | | | | | | | | | | | Updated Form action
* | | | Doc: Fixed tables and images for the new docsMorten Engvoldsen2010-05-111-19/+22
| | | | | | | | | | | | | | | | | | | | Added page.png to images dir. Fixed tables "generic"
* | | | qdoc: Yet another revision of the top doc page.Martin Smith2010-05-112-35/+35
| | | | | | | | | | | | | | | | Still more to come.
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-102-2/+4
|\ \ \ \
| * | | | Doc: Updates to the html template and javascriptMorten Engvoldsen2010-05-102-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
* | | | | qdoc: Another revision of the top doc page.Martin Smith2010-05-101-7/+6
|/ / / / | | | | | | | | | | | | More to come.
* | | | qdoc: Fixed annotated list generation to use <td>, not <th>.Martin Smith2010-05-071-2/+2
| | | |
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-071-11/+49
|\ \ \ \
| * | | | Doc: Chages to search feature, css and table orderMorten Engvoldsen2010-05-071-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the search results Fixed table css Added odd&even classes to tables generated by the thmlgenerator Reviewed-by: Morten Engvoldsen
* | | | | qdoc: Reorganized examples panel.Martin Smith2010-05-071-9/+9
|/ / / /
* | | | Doc: updating html and search featureMorten Engvoldsen2010-05-061-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | Doc: implementing the search feature in the online docs Reviewed-by: Morten Engvoldsen
* | | | doc: Second attempt to begin reorganizing the top doc page.Martin Smith2010-05-062-16/+14
| | | | | | | | | | | | | | | | This change actually changes the left panels. Much more to come.
* | | | Doc: Changes to the HTML outputMorten Engvoldsen2010-05-052-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | 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 Smith2010-05-051-13/+6
| | | | | | | | | | | | | | | | Much more to come.
* | | | qdoc: Removed [module name] from class ref pages.Martin Smith2010-05-051-0/+3
| | | | | | | | | | | | | | | | The module name is now a breadcrumb.
* | | | Doc: Updating style and HTML in CSS and qdocMorten Engvoldsen2010-05-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Adding all classnames generated in qdoc to the CSS and removing redundant &nbsp; from htmlgenerator. Reviewed-by: Trust Me
* | | | qdoc: Fixed the alphabet index in the compact list.Martin Smith2010-05-041-9/+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.
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-042-13/+37
|\ \ \ \
| * | | | qdoc: Fixed some breadcrumbs.Martin Smith2010-05-041-0/+1
| | | | |
| * | | | qdoc: Fixed class list problem.Martin Smith2010-05-042-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-10373 Task: QTBUG-10382
* | | | | Doc: A number of fixes and updates for the new design. See detailsMorten Engvoldsen2010-05-0413-770/+723
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-036-6/+64
|\ \ \ \ \ | |/ / / /
| * | | | qdoc: Added more API topics. Are these important?Martin Smith2010-05-033-4/+11
| | |_|/ | |/| |
| * | | qdoc: Added breadcrumbs for most other pages.Martin Smith2010-05-031-0/+8
| | | |
| * | | doc: Fixed some qdoc errors.Martin Smith2010-04-301-0/+1
| | | |
| * | | qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-302-3/+7
| | | |
| * | | qdoc: Added "All namespaces" to the API Lookup box.Martin Smith2010-04-301-0/+1
| | | |
| * | | qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-293-0/+37
| | | | | | | | | | | | | | | | Doesn't work in a few cases because of non-standard naming of things.
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-292-9/+20
|\ \ \ \ | |/ / /
| * | | qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
| |/ /
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-281-1/+1
|\ \ \ | |/ /
| * | qdoc: Fixed const-ness.Martin Smith2010-04-281-1/+1
| | |
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-272-27/+19
|\ \ \ | |/ /
| * | qdoc: Added breadcrumbs for class pages.Martin Smith2010-04-272-27/+19
| | |