summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Collapse)AuthorAgeFilesLines
* Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-07-269-1/+27
| | | | | | | | | | | | | | | | | | * Qt Simulator link missing * Integration and add-ins (on the front page, link leads to an alternative start page) * Qt Creator (on the front page link leads to Manual version 1.3) * Getting Started (on the front page) link broken * More... (in Global Declarations) link broken Additionally: There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly. I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-224-34/+62
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-163-20/+22
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| * | Doc: Excluded the QML documentation from the Qt-only set.David Boddie2010-07-163-0/+21
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Whitespace fixes.David Boddie2010-07-161-41/+41
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | qdoc: Fixed reporting of read-only status for QML properties.Martin Smith2010-07-221-1/+3
| |/ |/| | | | | Task-number: QTBUG-11512
* | Fixing merge conflicts.Martin Smith2010-07-131-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * | Replace 4.6 in all .qdocconf filesKai Koehne2010-07-091-3/+3
| | | | | | | | | | | | Reviewed-by: David Boddie
* | | Doc: Cleaning style and adding support for CreatorMorten Engvoldsen2010-07-093-24/+19
| |/ |/| | | | | Note: Support for creator has been disabled. HTML-generator needs an update.
* | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-091-1/+2
| |
* | Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| |
* | Doc: changing index pageMorten Engvoldsen2010-07-081-1/+0
| |
* | Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
| |
* | Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
|/
* Doc: fixing search script and styleMorten Engvoldsen2010-07-051-1/+1
|
* qdoc: Fixed spacing before "default" and "read-only".Martin Smith2010-07-021-0/+2
| | | | Task-number: QTBUG-11346
* Doc: Adding navigation and style fixes. Also rearranging qml elementsMorten Engvoldsen2010-07-011-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket::systemCaCertificates(): have one common case for all Unices Fixed QX11EmbedContainer. Improved a bit detection of a touch screen on Windows. qdoc: Fixed invalid format in the html header. link glu32 before opengl32 Stopped trying to output QML property list in 2 columns
| * qdoc: Fixed invalid format in the html header.Martin Smith2010-07-011-1/+1
| | | | | | | | Task-number: QTBUG-11803
* | update qml.qch to version 4.7mae2010-06-291-2/+2
|/ | | | | | | This fixes a version clash when both qt.qch and qml.qch are loaded into Qt Creator Done-with: Daniel Molkentin
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-281-2/+4
|\
| * Doc: fixing search bugMorten Engvoldsen2010-06-251-2/+4
| |
* | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
|/ | | | Reviewed-by: Trust Me
* Doc: Fixing bugs to style and scriptMorten Engvoldsen2010-06-212-11/+11
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1129-77/+604
|\
| * Doc: Fixed whitespace in the other configuration file for zh_CN.David Boddie2010-06-071-22/+22
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Fixed whitespace in the Simplified Chinese doc configuration.David Boddie2010-06-071-26/+26
| | | | | | | | Reviewed-by: Trust Me
| * * Add Japanese tutorial documentsTakumi ASAKI2010-06-078-0/+447
| | | | | | | | * Add Japanese hellotr example
| * Doc: updating imagesMorten Engvoldsen2010-06-0214-0/+0
| |
| * Doc: adding offline docs to assistant and Qt Creator. Improving small docs ↵Morten Engvoldsen2010-06-0210-30/+110
| | | | | | | | and adding highlighting
* | doc: Added DITA XML generatorMartin Smith2010-06-111-0/+11
|/ | | | Task-number: QTBUG-11391
* Doc: design changesMorten Engvoldsen2010-05-211-7/+0
| | | | Fixing menus and js
* Doc: Changes to the HTMLGenerator, style and jsMorten Engvoldsen2010-05-2111-1/+10
| | | | | | Replacing tables with lists in the HTML generator Adding img to search box Moving JS from template to script files
* 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).
* | Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-189-2/+30
|/ | | | 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.
* 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
* 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-101-2/+3
|\
| * Doc: Updates to the html template and javascriptMorten Engvoldsen2010-05-101-2/+3
| | | | | | | | Reviewed-by: Morten Engvoldsen
* | qdoc: Another revision of the top doc page.Martin Smith2010-05-101-7/+6
|/ | | | More to come.
* qdoc: Reorganized examples panel.Martin Smith2010-05-071-9/+9
|
* doc: Second attempt to begin reorganizing the top doc page.Martin Smith2010-05-061-16/+11
| | | | This change actually changes the left panels. Much more to come.
* Doc: Changes to the HTML outputMorten Engvoldsen2010-05-051-31/+26
| | | | | | 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.
* Doc: A number of fixes and updates for the new design. See detailsMorten Engvoldsen2010-05-0412-739/+681
| | | | | | | | | | | | | | | | | | | | | 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
* qdoc: Added more API topics. Are these important?Martin Smith2010-05-031-3/+8
|