summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-build-docs.qdocconf
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-221-1/+0
|\ | | | | | | kinetic-declarativeui
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-191-1/+0
| |\
| | * Docs: remove reference to nonexistent fileJoerg Bornemann2009-06-191-1/+0
| | | | | | | | | | | | Reviewed-by: David Boddie
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-281-3/+4
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-281-1/+1
| |\ \ | | |/
| | * Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-281-1/+1
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-271-1/+1
| |\ \ | | |/
| | * Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-241-1/+2
| |\ \ | | |/
| | * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-3/+3
| | | | | | | | | | | | Reviewed-By: TrustMe
* | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-3/+3
|\ \ \ | |/ /
| * | Merge branch '4.5'Rhys Weatherley2009-04-211-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | should have been part of c8285ec610b02f440f692be90aed1e6925a8675 Task-number: 251346 Reviewed-by: TrustMe BT: yes
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-1/+2
|/ /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-011-1/+5
|\ \ | |/ | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| * Doc: Exclude the internal Phonon classes from the Assistant documentation.David Boddie2009-03-301-1/+5
| | | | | | | | | | Task-number: 247060 Reviewed-by: TrustMe
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+109
|
* Long live Qt!Lars Knoll2009-03-231-0/+109