summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2811-11/+11
|\
| * Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-2811-11/+11
| | | | | | | | Reviewed-by: David Boddie
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-276-6/+6
|\ \ | |/
| * Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-276-6/+6
| | | | | | | | | | | | | | | | As we saw with the 4.5.1 release, failing to increment the namespaces when incrementing the Qt version causes some featuresof Assistant to break. Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-243-3/+6
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-243-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 242472777d440a540b4bc944c84eb522388e384e ) Changes in WebKit since the last update: ++ b/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" * WebKit.pro: Include docs.pri for "make docs" target. ++ b/WebKit/qt/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" Added code snippets and overview from the Qt sources references in the API docs. * Api/qwebpage.cpp: Adjust paths to snippets. * Api/qwebview.cpp: Ditto. * docs/docs.pri: Added. * docs/qtwebkit.qdoc: Added. * docs/qtwebkit.qdocconf: Added. * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. * docs/webkitsnippets/simple/main.cpp: Added. * docs/webkitsnippets/simple/simple.pro: Added. * docs/webkitsnippets/webpage/main.cpp: Added. * docs/webkitsnippets/webpage/webpage.pro: Added. Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit This is needed to have "make docs" inside WebKit and allows contributors to the WebKit project to write API docs. I'm doing the change in 4.5 to simplify merging with Qt 4.6. Reviewed-by: Trust me
| * Change Qt version number to 4.5.2Thiago Macieira2009-04-246-10/+10
| | | | | | | | Reviewed-By: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-04-231-7/+0
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * use qdoc3 debug version only when it is availableJoerg Bornemann2009-04-231-7/+0
| | | | | | | | | | | | | | By default there is no debug version built of qdoc3. In this case we should call the release build. Reviewed-by: kh
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-235-10/+9
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| * Make all qdoc footers consistent with the main Qt docs.Jason McDonald2009-04-225-10/+9
| | | | | | | | | | | | | | | | Use the same copyright message in all doc footers. As a side-effect, this change also removes most of the remaining THISYEAR placeholders, and fixes some footers that try to use 110% of the page width. Reviewed-by: Thiago
* | Remove git merge conflict markersSimon Hausmann2009-04-222-2/+0
| | | | | | | | Reviewed-by: Trust me
* | Merge branch '4.5'Rhys Weatherley2009-04-216-9/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.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
| * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1kh2009-04-216-19/+19
| | | | | | | | | | | | | | | | should have been part of c8285ec610b02f440f692be90aed1e6925a8675 Task-number: 251346 Reviewed-by: TrustMe BT: yes
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-171-1/+1
|\ \ | |/ | | | | | | Conflicts: tests/auto/qpainterpath/tst_qpainterpath.cpp
| * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1Kavindra Devi Palaraja2009-04-161-1/+1
| | | | | | | | | | | | Task-number: 251346 Reviewed-by: TrustMe BT: Yes
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-012-2/+6
|\ \ | |/ | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| * Doc: Exclude the internal Phonon classes from the Assistant documentation.David Boddie2009-03-302-2/+6
| | | | | | | | | | Task-number: 247060 Reviewed-by: TrustMe
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-261-0/+2
|\ \ | |/
| * Squashed commit of the following:David Boddie2009-03-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 20864878d046b2ce6bf5fc54868be8df346ce0c8 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:30:32 2009 +0100 Doc: Fixed qdoc warning by adding more descriptive text. Reviewed-by: TrustMe commit 3b620a0a4d1b02105c9761384a5abc4ecf11e9d2 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:29:56 2009 +0100 Doc: Added macros for future use. Reviewed-by: TrustMe
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-241-0/+8
|\ \ | |/
| * Squashed commit of the following:David Boddie2009-03-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 57ce15b2984cb7ccc4ab0b5dc03812d525d52620 Author: David Boddie <dboddie@trolltech.com> Date: Tue Mar 24 16:55:41 2009 +0100 Removed internal, hidden documentation. Also fixed the language used, slightly. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> commit 0a81cc2a6dfc98087de92e53d493bed56826642f Merge: 4bd3eca... dd7b1f1... Author: David Boddie <dboddie@trolltech.com> Date: Tue Mar 24 15:24:32 2009 +0100 Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 commit 4bd3eca8855bb2564e146be4d0a3bba836d20122 Merge: dc789e3... 1d1c52c... Author: David Boddie <dboddie@trolltech.com> Date: Mon Mar 23 19:20:05 2009 +0100 Merge branch 'qt/4.5' of ../qt-45-documentation into 4.5 commit 1d1c52c60995058b61ee35e3970fecc1de3b85b6 Merge: 6c5de23... 381b6cc... Author: David Boddie <dboddie@trolltech.com> Date: Mon Mar 23 19:17:37 2009 +0100 Merge branch 'qt/4.5' of git://scm.dev.nokia.troll.no/qt/qt-45 into qt/4.5 commit 6c5de23611baef3c6be59b94ebd29d901056c2fc Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 18:26:11 2009 +0100 Fixes: Doc: Fixed typo. Reviewed-by: David Boddie <dboddie@trolltech.com> commit 5d710cc183699513b1582507dcb4cddefb91c8ad Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 18:24:31 2009 +0100 Fixes: Doc: Made it clearer what qDebug() actually does. Reviewed-by: David Boddie <dboddie@trolltech.com> commit 1fae0b3b34bf066e2356671a5c6187485b2b587d Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 17:53:09 2009 +0100 Fixes: Doc: Added a note about not modifying the text document in a paint event handler. Task-number: 246550 Reviewed-by: David Boddie <dboddie@trolltech.com> commit 29662d44de9b42d811e60a1b57d871335888373a Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 17:04:07 2009 +0100 Fixes: Doc: Fixed styling of code in this tutorial. Task-number: 247053 Reviewed-by: David Boddie <dboddie@trolltech.com> commit 630c11d6f9f20d5f99bc964efaf4b39daaeb32c4 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 15:19:24 2009 +0100 Fixes: Doc: Note the use of just the name of a method rather than a complete signature. Task-number: 247857 Reviewed-by: David Boddie <dboddie@trolltech.com>
| * Long live Qt 4.5!Lars Knoll2009-03-23120-0/+34795
|
* Long live Qt!Lars Knoll2009-03-23120-0/+34795
generated by cgit v0.12 at 2024-11-28 15:21:59 (GMT)