summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Collapse)AuthorAgeFilesLines
* Fix for qtdemo bugJerome Pasion2011-01-111-3/+3
| | | | | | Task-number: QTBUG-15931 Reviewed-by: Kevin Wright (cherry picked from commit 963ada5805d61e318a04295b6d06e527b49cdb7a)
* Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-182-3/+11
|\ | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-112-3/+11
| | | | | | | | Task-number: QTBUG-15081
* | Bump Qt version to 4.7.2.Jason McDonald2010-11-1211-36/+36
|/ | | | Reviewed-by: Trust Me
* Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
|
* Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
|
* Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | | | | Task-number: QTBUG-14281 Reviewed-by: David Boddie
* Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-281-31/+0
|\
| * Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-281-31/+0
| |
* | Doc: Implementing new search displayMorten Engvoldsen2010-09-241-1/+8
|/
* Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-231-2/+2
|
* Bump version to 4.7.1.Jason McDonald2010-09-2111-36/+36
| | | | Reviewed-by: Trust Me
* Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
|
* Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
|
* Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-151-28/+22
| | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
* git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-151-1/+1
|\ | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| * Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-101-1/+1
| | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
* | Doc: Excluded the libconninet library from the documentation.David Boddie2010-09-084-6/+10
| | | | | | | | | | | | As discussed with the developers in Brisbane. Reviewed-by: Trust Me
* | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0712-100/+117
|\ \ | |/
| * Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ↵Morten Engvoldsen2010-09-071-1/+1
| | | | | | | | changing qml elements page
| * Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-0712-99/+116
| | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly
| * Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-031-1/+1
| |
* | Doc: Added dual documentation license information to the HTML templates.David Boddie2010-09-063-0/+27
|/ | | | | | | This completes the work to explicitly license the documentation under the GNU Free Documentation License and the Qt Commercial License. Reviewed-by: Trust Me
* Doc: Whitespace fixes.David Boddie2010-08-271-23/+23
|
* Doc: Updating menu linksMorten Engvoldsen2010-08-231-4/+7
|
* Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
|
* Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-201-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-121-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-111-4/+5
| |\
| * | qdoc: Fixed non-well-formed markup.David Boddie2010-08-091-1/+2
| | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-really-reviewed-by: Qt Doc Team
* | | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-099-28/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
| * | Doc: Fixing validation bugsMorten Engvoldsen2010-08-061-4/+5
| |/
| * qdoc: Removed three unused config variables.Martin Smith2010-08-058-24/+0
| | | | | | | | | | | | | | | | These no longer do anything in qdocconf files: online = false offline = false creator = true
* | Doc: Fixed qdoc warnings.David Boddie2010-08-051-5/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0412-88/+143
|\ \ | |/ | | | | | | Conflicts: doc/src/examples/qml-examples.qdoc
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-026-58/+57
| |\
| | * doc: Fixed many qdoc errors.Martin Smith2010-08-021-0/+1
| | |
| | * qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconfMartin Smith2010-08-025-58/+56
| | |
| * | Doc: adding changes to getting started and fixing redirection linksMorten Engvoldsen2010-08-021-1/+1
| |/
| * 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-165-30/+24
|\ \ \ | |/ /
| * | 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
| * | | 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
| | |
generated by cgit v0.12 at 2024-08-24 18:31:14 (GMT)