summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-05-041-8/+54
|\ | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * qdoc: Added breadcrumbs for most other pages.Martin Smith2010-05-031-0/+8
| |
| * qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-301-2/+7
| |
| * qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-291-0/+23
| | | | | | | | Doesn't work in a few cases because of non-standard naming of things.
| * qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-281-7/+17
| |
* | 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
| |
* | qdoc: Fixed const-ness.Martin Smith2010-04-281-1/+1
| |
* | qdoc: Added breadcrumbs for class pages.Martin Smith2010-04-271-26/+18
| |
* | qdoc: Removed MacRefs for Xcode documentation stuff.Martin Smith2010-04-271-0/+39
|/ | | | Also added the infrastructure for generating breadcrumbs.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-231-13/+30
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Removed nested <ul> elements from the TOC Diacritic input broken, duplicate the base glypha (on Mac OS X carbon) Cocoa: quiting the app from the menubar may cause a crash
| * qdoc: Removed nested <ul> elements from the TOCMartin Smith2010-04-231-13/+30
| | | | | | | | Moved the class="leveli" into the <li> elements.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-221-1/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits) Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-191-60/+93
| |\ | | | | | | | | | | | | | | | Conflicts: doc/src/template/style/style.css tools/qdoc3/htmlgenerator.cpp
| * | Doc: Put "default" property label on same line as property nameMartin Jones2010-04-161-10/+3
| | | | | | | | | | | | Task-number: QTBUG-6336
* | | Doc: Cleaning HTML generator and updating index.qdocMorten Engvoldsen2010-04-201-63/+60
| | | | | | | | | | | | | | | | | | Adding links to the index page and removing HTML attributes like align and valing form the HTML generator Reviewed-by: Martin Smith
* | | qdoc: Avoided putting bad chars in linksMartin Smith2010-04-201-3/+3
| | |
* | | qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-191-141/+154
| |/ |/| | | | | | | | | | | To generate the offline docs, do nothing. To generate the online docs, add this to your qdocconf file: "online = true"
* | qdoc: Output TOC for more class ref pages.Martin Smith2010-04-161-10/+6
| |
* | qdoc: Improved TOC for class ref pages.Martin Smith2010-04-161-9/+36
| |
* | 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.
* | 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-131-1/+75
| | | | This feature is not complete in this commit.
* qdoc: Changed qdoc to output the new doc format.Martin Smith2010-04-091-5/+74
| | | | Very cool.
* qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-071-0/+3
| | | | | | 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
* qdoc: Added <div> elements to some html output for class references.Martin Smith2010-03-301-1/+7
| | | | Task: QTBUG-9504
* Possible fix for missing QML properties in the qt.qhp file.Martin Smith2010-03-231-0/+2
| | | | | | Also adds more QML stuff to qt.index. Task: QTBUG-7724
* qdoc: ifdefed out all the debug code.Martin Smith2010-03-151-3/+0
| | | | | I think the crash that occurs when running qdoc over multiple qdocconf files is fixed.
* qdoc: Fixed lookup of QML property nodes.Martin Smith2010-03-111-2/+4
| | | | | At this point, no QML qdoc errors appear in the output. There is still a lot of debug output.
* qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-021-28/+32
| | | | | | | | | | | | | 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.
* Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-251-3/+27
| | | | | | 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-251-26/+2
| | | | | | This reverts commit d1b4e4666e4fe1a5fae0571c37535159c097f485. Reviewed-By: Martin Smith
* qdoc: List new QML elements in \sincelist for What's New page.Martin Smith2010-02-221-2/+26
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-191-27/+3
|\
| * qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-191-27/+3
| | | | | | | | | | | | The listed elements are now links. Task: QTBUG-8153
* | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-191-1/+0
|/ | | | | Reviewed-by: Trust Me Requested-by: Sales and Legal
* qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-181-0/+46
| | | | | | But the listed elements are not links yet, just plain text. Task: QTBUG-8153
* qdoc3: Completed handling of the new \pagekeywords command.Martin Smith2010-02-111-1/+10
| | | | Task: QTBUG-7877
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-111-60/+77
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-101-4/+114
| |\
| * \ Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-031-2/+7
| |\ \
| * | | qdoc: Added support for different source and output character encodings.David Boddie2010-02-021-60/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other documentation, and wrote out XHTML with the same encoding. This change adds additional configuration options (sourceencoding, outputencoding, naturallanguage) that enable translated documentation in non-Latin1 encodings to be built with qdoc. To be reviewed before merge into the master branch. Reviewed-by: Trust Me
* | | | qdoc3: Added curly braces in switch statement for braindead compiler.Martin Smith2010-02-111-10/+16
| |_|/ |/| | | | | | | | | | | | | | Also added the \pagekeywords command. Task: QTBUG-7877
* | | qdoc3: Fixed bug in creation of qt.pageindex.Martin Smith2010-02-101-1/+1
| | | | | | | | | | | | Task: QTBUG-7877
* | | qdoc3: Added capability to create qt.pageindex.Martin Smith2010-02-101-4/+114
| |/ |/| | | | | Task: QTBUG-7877