summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt.qdocconf
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-181-1/+5
|\ | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-111-1/+5
| | | | | | | | Task-number: QTBUG-15081
* | Bump Qt version to 4.7.2.Jason McDonald2010-11-121-4/+4
|/ | | | Reviewed-by: Trust Me
* Bump version to 4.7.1.Jason McDonald2010-09-211-4/+4
| | | | Reviewed-by: Trust Me
* Doc: Excluded the libconninet library from the documentation.David Boddie2010-09-081-0/+1
| | | | | | As discussed with the developers in Brisbane. Reviewed-by: Trust Me
* Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-071-7/+0
| | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly
* qdoc: Removed three unused config variables.Martin Smith2010-08-051-3/+0
| | | | | | | | These no longer do anything in qdocconf files: online = false offline = false creator = true
* qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconfMartin Smith2010-08-021-2/+2
|
* Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-07-261-1/+3
| | | | | | | | | | | | | | | | | | * Qt Simulator link missing * Integration and add-ins (on the front page, link leads to an alternative start page) * Qt Creator (on the front page link leads to Manual version 1.3) * Getting Started (on the front page) link broken * More... (in Global Declarations) link broken Additionally: There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly. I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
* Doc: Whitespace fixes.David Boddie2010-07-161-41/+41
| | | | Reviewed-by: Trust Me
* * Add Japanese tutorial documentsTakumi ASAKI2010-06-071-0/+1
| | | | * Add Japanese hellotr example
* Doc: adding offline docs to assistant and Qt Creator. Improving small docs ↵Morten Engvoldsen2010-06-021-1/+16
| | | | and adding highlighting
* Doc: Changes to the HTMLGenerator, style and jsMorten Engvoldsen2010-05-211-0/+1
| | | | | | Replacing tables with lists in the HTML generator Adding img to search box Moving JS from template to script files
* Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-181-0/+3
| | | | Fixing index page bugs
* qdoc: Yet another revision of the top doc page.Martin Smith2010-05-111-21/+21
| | | | Still more to come.
* Doc: A number of fixes and updates for the new design. See detailsMorten Engvoldsen2010-05-041-39/+21
| | | | | | | | | | | | | | | | | | | | | index.qdoc updated the HTML to use sprites images - deleted obsolete images from templates/images images - added new images to templates/images styles.css - updated styles to handle index, sprites and templates correct. assistant.qdoconf - updates images designer.qdoconf - updates images linguist.qdoconf - updates images declarative.qdoconf - updates images qmake.qdoconf - updates images qt-build-docs.qdoconf - updates images qt-build-docs_zh_CN.qdoconf - updates images qt-defines.qdoconf - updates images qt.qdoconf - updates images qt_zh_CN.qdoconf - updates images qt-htmlTemplates.qdoconf - updated template to use sprites declarativeui.qdoc - removed <br> Reviewed-by: Trust Me
* Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-201-7/+13
| | | | | | 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-151-6/+7
| | | | Reviewed-by: Trust Me
* qdoc: Fixed .qdocconf files for assistant.Martin Smith2010-04-151-1/+28
|
* qdoc: Changed qdoc to output the new doc format.Martin Smith2010-04-091-1/+2
| | | | Very cool.
* Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-191-7/+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-121-3/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-081-2/+7
| | | | | | | | | | | | | | 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: Synchronize configuration files for easier maintenance.David Boddie2010-02-021-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-011-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/deployment/deployment.qdoc doc/src/getting-started/installation.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/assistant/simpletextviewer/findfiledialog.h examples/assistant/simpletextviewer/mainwindow.cpp examples/webkit/fancybrowser/main.cpp src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/compat/config.cpp tools/assistant/compat/config.h tools/assistant/compat/docuparser.cpp tools/assistant/compat/docuparser.h tools/assistant/compat/fontsettingsdialog.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/helpdialog.h tools/assistant/compat/helpdialog.ui tools/assistant/compat/helpwindow.cpp tools/assistant/compat/helpwindow.h tools/assistant/compat/index.cpp tools/assistant/compat/index.h tools/assistant/compat/lib/qassistantclient.cpp tools/assistant/compat/lib/qassistantclient.h tools/assistant/compat/main.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.h tools/assistant/compat/mainwindow.ui tools/assistant/compat/profile.cpp tools/assistant/compat/profile.h tools/assistant/compat/tabbedbrowser.cpp tools/assistant/compat/tabbedbrowser.h tools/assistant/compat/tabbedbrowser.ui tools/assistant/compat/topicchooser.cpp tools/assistant/compat/topicchooser.ui tools/assistant/lib/qhelpsearchquerywidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/doc/assistant.qdocconf tools/assistant/tools/assistant/helpviewer.cpp tools/linguist/lupdate/main.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
* | \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-041-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-3/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp
| | * | Bump version to 4.6.2.Jason McDonald2010-01-191-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Doc fixes.Michael Brasser2010-01-151-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-7322
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-3/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| * | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-021-2/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-291-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06-221-1/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-281-3/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| * \ \ \ \ \ \ \ \ Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-2/+2
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-041-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bump version to 4.6.1Jason McDonald2009-12-011-3/+3
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | doc: Example page now lists images used by the exampleMartin Smith2009-12-041-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It just links to an empty page at the moment, i.e., it doesn't load the images. But I will add that. Task-number: QTBUG-4484
* | | | | | | | | Merge branch '4.6'Thiago Macieira2009-10-051-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.h tools/assistant/translations/translations_adp.pro tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf tools/qdoc3/test/qt.qdocconf translations/assistant_adp_de.ts
| * | | | | | | | Doc: Removed the old Console edition and updated edition naming.David Boddie2009-10-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Exclude the MMF Phonon plugin folder for qdoc.Frans Englich2009-10-011-0/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | As done for the other plugins. Brought to attention by Volker.
* | | | | | | | Merge branch '4.6'Thiago Macieira2009-09-291-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qt4-intro.qdoc
| * | | | | | | Generate mac refs in docs.Jason McDonald2009-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we don't make platform-specific source packages, we only have one version of the docs. These docs need to include all platforms. Reviewed-by: Trust Me
| * | | | | | | qdoc: Reverting 4.6 to %VERSION%.Martin Smith2009-09-211-1/+1
| | | | | | | |
| * | | | | | | qdoc: Added \brief texts to all the since 4.6 functions.Martin Smith2009-09-211-1/+1
| | |_|_|_|_|/ | |/| | | | |
generated by cgit v0.12 at 2024-07-16 12:56:16 (GMT)