summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* 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-272-27/+19
| |
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-272-17/+1
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-263-21/+29
| |\ | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp
| | * Doc: correcting a character bug in the footer.Morten Engvoldsen2010-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | Changed "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation>\n" \ into "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ Reviewed-by: trust me
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-231-13/+30
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-221-40/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qdeclarative.qdocconf
| * | | | Doc: Fixed the Declarative documentation set. Tweaked the others.David Boddie2010-04-225-26/+44
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | qdoc: Removed MacRefs for Xcode documentation stuff.Martin Smith2010-04-273-3/+50
| |_|_|/ |/| | | | | | | | | | | 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-222-20/+28
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-qml into 4.7-integrationQt Continuous Integration System2010-04-222-20/+28
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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). ...
| | * Do not treat images in qml examples differently.Yann Bodson2010-04-221-23/+7
| | |
| | * Modify qdoc to handle qml examples files.Yann Bodson2010-04-201-23/+45
| | | | | | | | | | | | Reviewed-by: Michael Brasser
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-1914-81/+1461
| | |\ | | | | | | | | | | | | | | | | | | | | 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
* | | | qdoc: Updated the extra images variable again, for each manual.qdocconf.Martin Smith2010-04-225-10/+43
|/ / / | | | | | | | | | And this time I also did it for qdeclarative.qdocconf
* | | qdoc: Updated the extra images variable for each manual.qdocconf.Martin Smith2010-04-214-4/+160
| | |
* | | Doc: Cleaning HTML generator and updating index.qdocMorten Engvoldsen2010-04-202-73/+68
| | | | | | | | | | | | | | | | | | Adding links to the index page and removing HTML attributes like align and valing form the HTML generator Reviewed-by: Martin Smith
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-204-28/+53
|\ \ \
| * | | Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-204-28/+53
| | | | | | | | | | | | | | | | | | | | | | | | Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin
* | | | qdoc: Avoided putting bad chars in linksMartin Smith2010-04-202-7/+10
|/ / /
* | | qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-194-141/+157
| |/ |/| | | | | | | | | | | 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
| |
* | 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