summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
Commit message (Collapse)AuthorAgeFilesLines
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-051-4/+4
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-1/+1
|\ | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-231-1/+1
| |\
| | * Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-171-1/+1
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | Bump Qt version to 4.7.4Timo Turunen2011-03-211-4/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Bump Qt version to 4.7.3Timo Turunen2011-03-091-4/+4
| |/ | | | | | | Reviewed-by: Trust Me
| * 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-3/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Doc: Excluded the libconninet library from the documentation.David Boddie2010-09-081-3/+4
| | | | | | | | | | | | As discussed with the developers in Brisbane. Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-8/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-071-8/+4
| | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-011-27/+40
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: bin/syncqt src/gui/text/qtextlayout.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/configure/configureapp.cpp
| * Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-231-1/+13
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Fixed whitespace in the Simplified Chinese doc configuration.David Boddie2010-06-071-26/+26
| | | | | | | | Reviewed-by: Trust Me
| * * Add Japanese tutorial documentsTakumi ASAKI2010-06-071-0/+1
| | | | | | | | * Add Japanese hellotr example
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-081-0/+1
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| * Doc: adding offline docs to assistant and Qt Creator. Improving small docs ↵Morten Engvoldsen2010-06-021-0/+1
| | | | | | | | and adding highlighting
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-011-0/+1
|\ \ | |/
| * 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-201-1/+4
|\ \ | |/
| * Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-181-1/+4
| | | | | | | | Fixing index page bugs
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-191-39/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf
| * 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-04-271-7/+13
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt.qdocconf
| * Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-201-7/+13
| | | | | | | | | | | | Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin
* | Long live Qt 4.8!Jason McDonald2010-04-221-5/+5
|/
* 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-8/+0
| | | | | Reviewed-by: Trust Me Requested-by: Sales and Legal
* 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: 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-051-0/+95
Reviewed-by: Trust Me