summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-185-14/+27
|\ | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-113-10/+20
| | | | | | | | Task-number: QTBUG-15081
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-112-3/+3
| |\
| * | qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-112-4/+7
| | | | | | | | | | | | Task-number: QTBUG-13939
* | | Bump Qt version to 4.7.2.Jason McDonald2010-11-1212-40/+40
| |/ |/| | | | | Reviewed-by: Trust Me
* | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-082-3/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-052-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-032-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-032-3/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | * Doc: Fixing typoSergio Ahumada2010-11-012-3/+3
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-051-2/+2
|\ \ \ \ \
| * | | | | Doc: adding html clasnames to the next and previous linksMorten Engvoldsen2010-11-041-2/+2
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: David Boddie
* | | | | Doc: Updated the configuration file to use the Qt 4.7 style sheets.David Boddie2010-11-051-34/+219
| | | | |
* | | | | qdoc: Remove leading QML: text from certain node names.David Boddie2010-11-041-1/+5
|/ / / / | | | | | | | | | | | | Reviewed-by: Martin Smith
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-041-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-032-4/+34
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: qdoc: Added next and previous links to top of pages. Doc: style tuning Doc: fixing style - tool buttons to bold. Doc: updating the template to support search feature better. Doc: Fixing columns to display all elements in lists - css3 Doc: fixing bugs in style Doc: fixing style for search display and slim fit menus Doc: Fixing bug in sorting script for search results. Doc: Fixed basic language. Doc: Added Windows Vista to the trademark list. Doc: Updated the Java trademark information. Doc: Moved QFileSystemModel example code to the class documentation. Doc: Corrected the name property as it was incorrectly declared.
| * | | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
| | |/ | |/| | | | | | | | | | as a side effect, the target is now named html-docs instead of docs to be consistent with the qt docs.
* | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
| |/ |/|
* | qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| | | | | | | | Task-number: QTBUG-14979
* | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
|/
* Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1
|
* Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | | | | Task-number: QTBUG-14281 Reviewed-by: David Boddie
* qdoc: Don't generate html output for png files.Martin Smith2010-10-071-2/+2
|
* Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-041-5/+5
| | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* Doc: Removed a superfluous comment.David Boddie2010-10-041-1/+0
| | | | | Related to the rejected, but valid merge request: http://qt.gitorious.org/qt/qt/merge_requests/809
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-3014-89/+68
|\
| * Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-282-47/+19
| |\
| | * Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-281-31/+0
| | |
| | * Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| | | | | | | | | | | | | | | Reviewed-by: David Boddie Task:QTBUG-13786
| * | 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-2112-40/+40
| | | | | | | | Reviewed-by: Trust Me
* | Doc: Fixed non-well-formed table output.David Boddie2010-09-241-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Doc: Fixed coding style breakage in qdoc source code.David Boddie2010-09-231-65/+64
|/ | | | Reviewed-by: Trust Me
* Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
|
* Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
|
* Merge branch '13092010doc' into doc-4.7Morten Engvoldsen2010-09-161-4/+4
|\ | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| * Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-162-15/+5
| |
| * Doc: correcting html template - validatingMorten Engvoldsen2010-09-161-1/+1
| |
| * Doc: correcting html templateMorten Engvoldsen2010-09-161-28/+22
| |
* | 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.
* | qdoc: Fixed an html formatting error in the QML property list.Martin Smith2010-09-151-21/+1
| |
* | 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
| |