summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Collapse)AuthorAgeFilesLines
* 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-201-10/+8
| | | | | | Adding links to the index page and removing HTML attributes like align and valing form the HTML generator Reviewed-by: Martin Smith
* Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-204-28/+53
| | | | | | Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin
* qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-191-0/+1
| | | | | | | To generate the offline docs, do nothing. To generate the online docs, add this to your qdocconf file: "online = true"
* qdoc: Added the index and fixed images in the extra files list.David Boddie2010-04-155-27/+30
| | | | Reviewed-by: Trust Me
* qdoc: Fixed .qdocconf files for assistant.Martin Smith2010-04-154-4/+113
|
* Revert "Doc: Updating design files."Morten Engvoldsen2010-04-142-2/+2
| | | | This reverts commit d88dade723d5ddd86eea70ee4bf636c06b9f3962.
* 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: Changed qdoc to output the new doc format.Martin Smith2010-04-0913-36/+207
| | | | Very cool.
* qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0735-1433/+0
| | | | | | Coming soon! Task: QTBUG-9504
* qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0735-0/+1433
| | | | | | Coming soon! Task: QTBUG-9504
* Updated URLs.Robert Loehning2010-03-041-1/+1
| | | | Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* doc: Fixed building documentationThorbjørn Lindeijer2010-03-011-0/+0
| | | | qml.qdocconf wasn't renamed yet.
* Doc: Added a config file for creating Simplified Chinese docs directly.David Boddie2010-02-251-0/+86
| | | | Reviewed-by: Trust Me
* Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-193-23/+0
| | | | | Reviewed-by: Trust Me Requested-by: Sales and Legal
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-125-8/+166
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. ...
| * Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-081-3/+2
| | | | | | | | | | | | | | | | | | | | The documentation root in the qdocconf file now refers to the Chinese title for the Tutorials page. Modified qdoc's function to canonicalize titles so that it preserves characters that outside the range of ASCII letters and numbers. Reviewed-by: Trust Me
| * Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-082-4/+14
| | | | | | | | | | | | | | We now write UTF-8 encoded XHTML and assume all pure documentation which isn't pure ASCII is now UTF-8 encoded. Reviewed-by: Trust Me
| * Doc: Updated the configuration file for the Simplified Chinese docs.David Boddie2010-02-081-11/+9
| | | | | | | | Reviewed-by: Trust Me
| * qdoc: Standardized encoding names and updated the Chinese config files.David Boddie2010-02-053-0/+150
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Synchronize configuration files for easier maintenance.David Boddie2010-02-022-4/+5
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-043-4/+86
|\ \ | |/ |/| | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| * Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-206-10/+10
| |\ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp
| | * Bump version to 4.6.2.Jason McDonald2010-01-196-10/+10
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-191-1/+1
| |\ \ | | |/
| * | Doc fixes.Michael Brasser2010-01-152-3/+3
| | | | | | | | | | | | Task-number: QTBUG-7322
| * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-144-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-076-10/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| * \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-271-16/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| * \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-091-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
| * | | | | | qdoc3: display 'read-only' in QML docs for read only properties.Michael Brasser2009-10-301-1/+6
| | | | | | |
| * | | | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-291-150/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp src/script/api/qscriptprogram.cpp src/script/api/qscriptprogram.h src/script/api/qscriptprogram_p.h tests/auto/qscriptengine/tst_qscriptengine.cpp tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp tools/qdoc3/test/qt-inc.qdocconf
| * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-251-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-193-35/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/s60installs/qt.iby util/qlalr/cppgenerator.cpp
| * | | | | | | | | Improve qdoc generated QML documentation.Michael Brasser2009-10-091-1/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-041-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure
| * \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-0210-22/+22
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-294-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6' into kinetic-declarativeuiLars Knoll2009-09-183-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-011-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/classic.css
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-251-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf tools/configure/configureapp.cpp
| * | | | | | | | | | | | | | | Various doc fixes.Michael Brasser2009-08-191-29/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make QML docs fit in with the new Qt style. Fix numerous qdoc errors.
| * | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-192-27/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: doc/src/index.qdoc doc/src/topics.qdoc src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h tests/auto/auto.pro
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-1312-25/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-239-16/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-102-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-241-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-222-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp