summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Output TOC for more class ref pages.Martin Smith2010-04-161-10/+6
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-165-27/+30
|\
| * qdoc: Added the index and fixed images in the extra files list.David Boddie2010-04-155-27/+30
| | | | | | | | Reviewed-by: Trust Me
* | qdoc: Improved TOC for class ref pages.Martin Smith2010-04-162-10/+39
|/
* qdoc: Fixed .qdocconf files for assistant.Martin Smith2010-04-154-4/+113
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-142-2/+2
|\
| * Revert "Doc: Updating design files."Morten Engvoldsen2010-04-142-2/+2
| | | | | | | | This reverts commit d88dade723d5ddd86eea70ee4bf636c06b9f3962.
* | qdoc: Removed all <table> attributes in favor of using css.Martin Smith2010-04-141-40/+25
|/
* qdoc: Checked for empty title.Martin Smith2010-04-141-2/+4
|
* qdoc: Added TOC to class ref pages.Martin Smith2010-04-141-0/+1
| | | | | | It isn't a full TOC yet. It only includes h1, h2, etc from the Detaled Description part. In many classes, there aren't any of these, so many classes won't have a TOC yet.
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-138-15/+1248
|\
| * Doc: Updating design files.Morten Engvoldsen2010-04-132-2/+2
| | | | | | | | Reviewed-by: trustme
| * Doc: Fixing design bugs. Updating the index page and script/style files. ↵Morten Engvoldsen2010-04-138-13/+1246
| | | | | | | | | | | | Adding some image files. Reveiwed-by: trustme
* | qdoc: Added TOC to module pages.Martin Smith2010-04-131-15/+19
|/
* qdoc: Changed <ul> elements in TOC.Martin Smith2010-04-131-2/+11
| | | | Each <ul> is now <ul class="leveli">, where i is 1..n.
* qdoc: Fixed some TOC links.Martin Smith2010-04-131-1/+0
|
* qdoc: Added new table of contents for non-class ref pagesMartin Smith2010-04-133-3/+76
| | | | This feature is not complete in this commit.
* qdoc: Changed qdoc to output the new doc format.Martin Smith2010-04-0919-45/+351
| | | | Very cool.
* qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0736-1433/+2
| | | | | | Coming soon! Task: QTBUG-9504
* qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0737-0/+1438
| | | | | | Coming soon! Task: QTBUG-9504
* qdoc: Added <div> elements to some html output for Fake nodes.Martin Smith2010-04-061-4/+8
| | | | Task: QTBUG-9504
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-016-43/+87
|\ | | | | | | | | Conflicts: src/gui/text/qstatictext.cpp
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-301-1/+1
| |\
| | * Fix compilation with Sun CC:Thiago Macieira2010-03-291-1/+1
| | | | | | | | | | | | | | | | | | "node.cpp", line 1337: Error: There is extra text on this line. Reviewed-by: Trust Me
| * | qdoc: Added <div> elements to some html output for class references.Martin Smith2010-03-305-42/+86
| |/ | | | | | | Task: QTBUG-9504
* | Doc: Updated the qdoc manual with i18n info. Fixed a code example.David Boddie2010-03-302-18/+90
| | | | | | | | Reviewed-by: Trust Me
* | Fix bad mergeOlivier Goffart2010-03-251-15/+7
| |
* | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-256-36/+147
|\ \ | |/ | | | | | | | | Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp
| * Possible fix for missing QML properties in the qt.qhp file.Martin Smith2010-03-234-23/+126
| | | | | | | | | | | | Also adds more QML stuff to qt.index. Task: QTBUG-7724
| * qdoc3: Fixed some ifdef typos and removed some whitespace.Martin Smith2010-03-172-10/+10
| |
* | Fix warnings and build on mingwThierry Bastian2010-03-252-5/+5
|/
* qdoc: ifdefed out all the debug code.Martin Smith2010-03-159-9/+17
| | | | | I think the crash that occurs when running qdoc over multiple qdocconf files is fixed.
* CompileKent Hansen2010-03-111-1/+1
|
* qdoc: Added debug code.Martin Smith2010-03-116-0/+7
|
* qdoc: Fixed lookup of QML property nodes.Martin Smith2010-03-113-2/+23
| | | | | At this point, no QML qdoc errors appear in the output. There is still a lot of debug output.
* qdoc: Clear a static multimap after each qdocconf file.Martin Smith2010-03-083-0/+11
| | | | Task: QTBUG-8804
* qdoc: Added some debug output to track down a crashMartin Smith2010-03-081-2/+2
| | | | The crash doesn't happen on my OS X 10.4.
* Updated URLs.Robert Loehning2010-03-041-1/+1
| | | | Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* doc: Fixed some qdoc errors.Martin Smith2010-03-041-1/+3
| | | | | | | The QtMultimedia module needed to have its own \page unique name so that the QtMultimedia \module would not conflict with the QtMultimedia \namespace.
* qdoc3: Trying to find a bug that causes a crash.Martin Smith2010-03-032-8/+7
| | | | | | | | It doesn't crash on OS X, but it does on some other platforms. If you run into this crash running qdoc3, you can work around it by commenting out line 1539 in tools/qdoc3/htmlgenerator.cpp The line to comment out is: generateQmlInheritedBy(qml_cn, marker);
* Compile.Morten Johan Sørvig2010-03-021-0/+1
|
* Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-0215-21/+53
|\
| * Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-0115-21/+53
| | | | | | | | | | | | | | This allows building documentation even when cross-compiling. Note that for official documentation, you should always use your host's qdoc3 binary. This qmake option is for testing whether you introduced new qdoc warnings even if you don't have a native build around.
* | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-027-36/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | This change caused a crash on several platforms before, but not on mine, of course. It outputs a list of new QML elements on the What's New in 4.7 page, and it outputs the "Inherited by" list on each QML elemnent page for elements that are inherited by other elements. I can't see why it should crash anything, but I have included some debug output. I think the crash might have something to do with QList<T>, which qdoc3 uses heavily. If it crashes for you, please get a stack trace and the debug output.
* | doc: Fixed building documentationThorbjørn Lindeijer2010-03-011-0/+0
| | | | | | | | qml.qdocconf wasn't renamed yet.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-2610-73/+124
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-259-72/+123
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) Doc: Added a config file for creating Simplified Chinese docs directly. Doc: add a few lines about bearer managment to "What's New" page. Fix the SIMD implementations of QString::toLatin1() Update of the QScriptValue autotest suite. New data set for QScriptValue autotest generator. Autotest: make tst_qchar run out-of-source too Autotest: add a test for roundtrips through toLatin1/fromLatin1 Implement toLatin1_helper with Neon QRegExp::pos() should return -1 for empty/non-matching captures Revert "qdoc: Finished "Inherited by" list for QML elements." Revert "qdoc: List new QML elements in \sincelist for What's New page." Add the Unicode normalisation properties. Autotest: add a test for QDBusPendingCallWatcher use in threads Doc: placeholders for new feature highlights. doc: mark as reimplemented. Update of the QScriptValue autotest suite. New autotests cases for QScriptValue autotests generator. QScriptValue autotest generator templates change. Fix license template. QScriptValue::isQMetaObject crash fix. ...
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-257-71/+36
| | |\
| | | * Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-256-44/+35
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 83d7242271cf8196a8133de0406788135e16abbb. Reviewed-by: Martin Smith
| | | * Revert "qdoc: List new QML elements in \sincelist for What's New page."Andreas Aardal Hanssen2010-02-252-28/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d1b4e4666e4fe1a5fae0571c37535159c097f485. Reviewed-By: Martin Smith