summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* 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-282-47/+19
| |\
| | * 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-042-18/+21
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| |/ | | | | | | | | Reviewed-by: David Boddie Task:QTBUG-13786
| * Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-231-2/+2
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-221-4/+4
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| * Bump version to 4.7.1.Jason McDonald2010-09-2112-40/+40
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-218-61/+56
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
| |
| * Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
| |
| * Merge branch '13092010doc' into doc-4.7Morten Engvoldsen2010-09-161-4/+4
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| | * Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-162-15/+5
| | |
| | * Doc: correcting html template - validatingMorten Engvoldsen2010-09-161-1/+1
| | |
| | * Doc: correcting html templateMorten Engvoldsen2010-09-161-28/+22
| | |
| * | Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-151-28/+22
| |/ | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
| * git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-151-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| | * Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
| * | qdoc: Fixed an html formatting error in the QML property list.Martin Smith2010-09-151-21/+1
| | |
| * | Doc: Excluded the libconninet library from the documentation.David Boddie2010-09-084-6/+10
| | | | | | | | | | | | | | | | | | As discussed with the developers in Brisbane. Reviewed-by: Trust Me
| * | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0712-100/+117
| |\ \ | | |/
| * | Doc: Added dual documentation license information to the HTML templates.David Boddie2010-09-063-0/+27
| | | | | | | | | | | | | | | | | | | | | This completes the work to explicitly license the documentation under the GNU Free Documentation License and the Qt Commercial License. Reviewed-by: Trust Me
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1014-124/+142
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ↵Morten Engvoldsen2010-09-071-1/+1
| | | | | | | | | | | | changing qml elements page
| * | Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-0712-99/+116
| | | | | | | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly
| * | Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-031-1/+1
| |/
| * QString usage cleanupsOswald Buddenhagen2010-09-011-1/+1
| | | | | | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh)
| * make qdoc3 boot-strappable againHarald Fernengel2010-08-301-0/+1
| |
| * Doc: Whitespace fixes.David Boddie2010-08-271-23/+23
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-302-6/+16
|\ \ | |/ | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * qdoc: Fixed erroneous links to QML basic types.Martin Smith2010-08-251-2/+9
| | | | | | | | Task-nr: QTBUG-13096
| * Doc: Updating menu linksMorten Engvoldsen2010-08-231-4/+7
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-256-49/+167
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
| |
| * Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-201-1/+1
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-201-5/+4
| |\
| | * qdoc: Changed id attribute to be a UUID.Martin Smith2010-08-201-5/+4
| | | | | | | | | | | | Task-nr: QTBUG-11113
| * | Doc: fixing creator bugs, removing menus and textbox in the headerMorten Engvoldsen2010-08-201-6/+7
| |/
| * qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| | | | | | | | Task-nr: QTBUG-11113
| * qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-3/+3
| | | | | | | | Task-nr: QTBUG-11113
| * qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| | | | | | | | Task-nr: QTBUG-11113
| * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-182-35/+95
| | | | | | | | ...and a set of functional group pages.
| * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+21
| | | | | | | | ...and a set of functional group pages.
| * qdoc: Added the fix to change qml-qml-file.name to qml-file.nameMartin Smith2010-08-131-3/+3
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1322-231/+487
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.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-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-123-41/+171
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-128-23/+111
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| | * \ Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-111-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| | * \ \ Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0915-146/+160
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
generated by cgit v0.12 at 2025-01-28 21:06:32 (GMT)