summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1028-2506/+1171
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
| |
| * Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
| * Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
| * Removed a configuration file that can no longer be used.David Boddie2011-01-241-12/+0
| |
| * Doc: Updated the Qt version number.David Boddie2010-12-211-4/+4
| |
| * Doc: Fixed whitespace.David Boddie2010-12-213-11/+11
| |
| * Updated the offline template to use a new offline style sheet.David Boddie2010-12-172-17/+10
| |
| * Whitespace fixes.David Boddie2010-12-171-1/+1
| |
| * Removed macros for figures and floats. We'll use \div...\enddiv instead.David Boddie2010-12-141-32/+0
| |
| * Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-145-53/+42
| |\ | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| | * Added macros for floating images and floating images with alt text.David Boddie2010-12-131-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Ideally, these would be HTML-only macros, but the macro system doesn't know whether macro arguments used in pure HTML are file names, so the necessary files are not included. By using qdoc commands, we ensure the files are copied into the generated documentation's images directory.
| | * Removed redundant style information and images.David Boddie2010-12-094-53/+10
| | |
| * | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-142-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is necessary for the Mimir project, but it is also useful for writing html output in that now you can write the index page (and other such pages) using pure qdoc commands. i.e. you don't need to use raw html for this sort of thing anymore.
| * | doc: Removed the \hr macro from the DITA XML qdocconf file.Martin Smith2010-12-091-1/+1
| | | | | | | | | | | | This eliminates some "raw-html" cases.
| * | Updated the DITA configuration to use the new configuration structure.David Boddie2010-12-071-1/+1
| | |
| * | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0730-2461/+1189
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| | * Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-11-307-20/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| | * | Fixed grammar.David Boddie2010-11-292-2/+2
| | | |
| | * | Added the version number to the configuration and fixed the generator.David Boddie2010-11-241-1/+4
| | | | | | | | | | | | | | | | Now the version number should appear in the documentation again.
| | * | Moved style-specific declarations. Removed script declarations.David Boddie2010-11-184-43/+70
| | | |
| | * | Started fixing qdoc's output to use some kind of page templates.David Boddie2010-11-1117-1137/+1139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed hard-coded style and script information. Split .qdocconf files to help separate content and presentation. Task-number: QTBUG-15208
| | * | Removed obsolete files.David Boddie2010-11-106-1336/+0
| | | | | | | | | | | | | | | | | | | | Apparently, these files are no longer used, being duplicates of those in doc/src/template.
| * | | qdoc: Fixed some reported bugs in the XML.Martin Smith2010-12-061-1/+7
| | | |
| * | | Merge branch '4.7' into mimirMorten Engvoldsen2010-10-091-2/+3
| |\ \ \
| * \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-291-32/+8
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-2312-38/+38
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMorten Engvoldsen2010-09-201-0/+31
| |\ \ \ \ \ \
| | * | | | | | qdoc: DITA XML generator now uses <section> elements...Martin Smith2010-09-181-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...instead of <p> elements with the outputclass attribute set to some h value. Also added some missing macros to qt-ditaxml.qdocconf, but there is more to think about here.
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | | | | | | | Fix for qtdemo bugJerome Pasion2011-01-101-3/+3
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15931 Reviewed-by: Kevin Wright
* | | | | | | | Merge remote branch 'qt/master'Jason McDonald2010-11-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| * \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-192-2/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
* | \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-11-196-15/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/corelib/global/qglobal.h src/gui/kernel/qgesturemanager.cpp src/gui/kernel/qwidget_p.h 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/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * | | | | | | | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-182-3/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | | | | | | qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-112-3/+11
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15081
| * | | | | | | Bump Qt version to 4.7.2.Jason McDonald2010-11-1211-36/+36
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * | | | | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
| | | | | | |
* | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-041-1/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-2/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | | | | Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Task-number: QTBUG-14281 Reviewed-by: David Boddie
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-32/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * | | | Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-281-31/+0
| |\ \ \ \
| | * | | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-281-31/+0
| | | |_|/ | | |/| |
| * | | | Doc: Implementing new search displayMorten Engvoldsen2010-09-241-1/+8
| |/ / /
* | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * | | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-231-2/+2
| | | |
| * | | Bump version to 4.7.1.Jason McDonald2010-09-2111-36/+36
| |/ / | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-01-15 14:05:21 (GMT)