summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-102-2/+4
|\ | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * doc: Corrected several qdoc warnings.Martin Smith2009-07-022-2/+4
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-241-0/+2
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+2
| | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-222-2/+0
|\ \ | |/ | | | | kinetic-declarativeui
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-192-2/+0
| |\
| | * Docs: remove reference to nonexistent fileJoerg Bornemann2009-06-192-2/+0
| | | | | | | | | | | | Reviewed-by: David Boddie
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-191-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * Bump qt-eclipse version number in docsJarek Kobus2009-06-091-1/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-111-36/+40
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicswidget.cpp src/gui/painting/qdrawutil.cpp src/gui/painting/qpainterpath.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | doc: Fixed several qdoc warnings.Martin Smith2009-06-112-2/+4
| | |
| * | Reduce left-margins in qdocJens Bache-Wiig2009-06-101-6/+3
| | | | | | | | | | | | | | | | | | The current implementation is a bit hackish and does not work for all cases. It is better to remove it for now until we have a proper way of supporting it.
| * | Some adjustments to the documentationJens Bache-Wiig2009-06-101-32/+39
| | | | | | | | | | | | | | | Headers are slightly lighter now. Not all tables are affected by the changes any more.
* | | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-101-6/+43
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp
| * | qdoc: The gray version.Martin Smith2009-06-091-6/+43
| | |
| * | qdoc: Inserted <hr> between summary sections.Martin Smith2009-06-091-1/+1
| | | | | | | | | | | | | | | Also added the left and right borders to the function headers in the detail sections.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-091-3/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| * | qdoc: Changed to mountain fresh blue.Martin Smith2009-06-081-3/+2
| | | | | | | | | | | | | | | I didn't test this, because I can't build qdoc3 due to changes in QStringBuilder.
* | | Merge commit 'mainline/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-041-10/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h tools/qdoc3/htmlgenerator.cpp
| * | qdoc: Reset the memItemLeft width property to 200.Martin Smith2009-06-041-1/+1
| | |
| * | qdoc: Fixed some spacing problems.Martin Smith2009-06-031-1/+1
| | |
| * | qdoc: Changed the css to make more people happy.Martin Smith2009-06-021-10/+10
| | | | | | | | | | | | | | | | | | | | | No more fonts less than 100%. Toned down the green lines separating table rows, now gray (or we can try a softer green). Made the table widt 100%. More coming. the constructors still aren't aligned properly.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-271-7/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-4/+4
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| | * Correcting bugs in classic.cssMorten Engvoldsen2009-05-261-4/+4
| | | | | | | | | | | | | | | | | | Correcting invalid padding values. none is not a valid padding value. Rev-by: David Boddie
| * | qdoc: Fixed non-well-formed XML.David Boddie2009-05-251-0/+1
| | | | | | | | | | | | Reviewed-by: Martin Smith
| * | Doc - removing the constraint on font size.Kavindra Devi Palaraja2009-05-221-3/+0
| | | | | | | | | | | | Reviewed-By: David Boddie
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-221-13/+63
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/kernel/kernel.pri src/corelib/tools/tools.pri tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h
| * | Inject some more Qt colors into the css to make it look a bit more QtSoftwareThomas Zander2009-05-201-22/+12
| | | | | | | | | | | | Reviewed-By: Kavindra Palaraja
| * | Doc - changing the stylesheet to use a greeny color.Kavindra Devi Palaraja2009-05-191-2/+2
| | | | | | | | | | | | Reviewed-By: David Boddie
| * | Modernize the output of qdoc a bit.Thomas Zander2009-05-191-2/+62
| | | | | | | | | | | | | | | | | | Now we have explicit columns we cann make our docs look a bit better using some simple css additions. This adds light backgrounds in targetted places to make the text more readable.
* | | qdoc: Fixed some qdoc errors.Martin Smith2009-05-122-2/+4
| | |
* | | Improve QML documentation viewing in Assistant.Michael Brasser2009-05-051-0/+77
| | | | | | | | | | | | | | | The element pages now load correctly. A separate QML 'book' is also generated, which will be targeted at non-C++ programmers.
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-301-21/+28
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Documentation work.Michael Brasser2009-04-301-21/+28
| | | |
* | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-301-1/+2
|/ / /
* | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-291-1/+2
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-2812-28/+30
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | 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' 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
* | | Make the documentation build.Alexis Menard2009-04-232-2/+0
| | |
generated by cgit v0.12 at 2024-12-28 15:54:40 (GMT)