summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
|
* qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | | | Added a function to class Config to unload the qdocconf file. This is for the qdoc wizard.
* qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
|
* qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
|
* qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
|
* qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
|
* qdoc: Updated the QDoc manual.Martin Smith2011-04-071-38/+127
|
* qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23
|
* qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
|
* Fixed the declarative headers and includes within qdoc.David Boddie2011-04-0522-56/+56
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0512-102/+346
|\
| * qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-059-44/+152
| | | | | | | | | | Also output mainters for classes in the HTML output, if there are maintainers listed.
| * qdoc: modified \include to take a 2nd arg, snippet id.Martin Smith2011-04-014-33/+123
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-302-34/+39
| |\
| * | qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-299-103/+155
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-281-53/+38
| |\ \ | | |/
| | * qdoc: Updates to the qdoc manual.Martin Smith2011-03-281-53/+38
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-282-34/+39
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-03-2742-6883/+10890
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits) qdoc: Avoid infinite loops in table of contents generation. Removed the documentation from the install rule. qdoc: Added the <othermeta> element. qdoc: Completed changing <section> structure. Doc: Fixed reference to absolete API in exceptionsafety.html Doc: Removed links to obsolete API in QResource Doc: Fixed broken links in QIcon::fromTheme() Doc: Fixed doc bug in undo framework example Doc: Fixed typo. qdoc: Changed <section> structure. Doc: Typo fixes Doc: Fixed snippet documenting QMetaObject::classInfo Doc: Cannot alter SelectionMode of a combobox's view qdoc: Added <publisher> and <permissions> elements. qdoc: Added <component> element to contain the module name. qdoc: Added <prodinfo> element and its contents to the metadata. Doc: Fixed a doc bug in the Rogue example Doc: Small change to QByteArray::resize() Doc: Small change to ListModel docs Doc: QtDemo now gives error message when example doc cannot be loaded ...
| | * | sort out stdout vs. stderr usageOswald Buddenhagen2011-03-222-34/+39
| | | | | | | | | | | | | | | | Task-number: QTBUG-14728
| * | | qdoc: Added a way to exclude directories from receiving default metadataMartin Smith2011-03-281-0/+20
| | | | | | | | | | | | | | | | But it is ifdefed out because I think we won't use it.
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2520-35/+12902
| |\ \ \
| * | | | qdoc: Added default values to config file for DITAMartin Smith2011-03-255-16/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added the handling of these default values: dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Nokia dita.metadata.default.copyryear = 2011 dita.metadata.default.copyrholder = Nokia dita.metadata.default.audience = programmer
* | | | | Removed some links and prettified others.David Boddie2011-03-251-12/+26
| |/ / / |/| | |
* | | | Avoided the use of hard-coded file names.David Boddie2011-03-241-34/+70
| | | |
* | | | Copied the declarative parser into qdoc3 to avoid dependency issues.David Boddie2011-03-2419-1/+12832
|/ / /
* | | qdoc: Don't wrap <image> in <fig> if in an <xref>Martin Smith2011-03-241-2/+4
| | |
* | | qdoc: Added <copyright>, <copyryear>, and <copyrholder>.Martin Smith2011-03-241-3/+19
| | |
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2425-86/+429
|\ \ \
| * \ \ Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-236-6/+263
| |\ \ \ | | |_|/ | |/| |
| | * | Adopting changes from a merge with qt-doc-team repo, 4.7 branchJerome Pasion2011-03-223-3/+3
| | | |
| | * | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7Jerome Pasion2011-03-185-321/+382
| | |\ \
| | * | | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-175-6/+262
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2218-76/+159
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| | * | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-214-43/+109
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.7.4
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-184-1/+39
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added setSwitchPolicy to MeeGo graphicssystem helper API.
| | | | * | | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-184-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets the application control whether or not automatic switching should be used, and also to completely disable switching if desired. Reviewed-by: Armin Berres
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-164-43/+71
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoLivePixmapData : when creating QImage, use constructor with pitch. Added automatic graphicssystem switching on meego when app is minimized.
| | | | * | | Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-164-43/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When all top-level widgets are minimized we switch to raster to reduce GPU memory consumption. We switch back to graphicssystem meego when at least one top-level widget is shown normally again. The switching only applies when the runtime graphicssystem is being used. The switching only applies when the runtime graphicssystem is being used. Task-number: QTBUG-18013 Reviewed-by: Armin Berres
| | * | | | | Bump Qt version to 4.7.4Timo Turunen2011-03-2110-29/+29
| | |/ / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-152-3/+5
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Fix a bug affecting tab reordering of promoted tab widgets. Designer: Fix a bug clearing the Z-Order when adding a new widget. Adjust right bearing when breaking with line separators
| | | * | | Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event filter was added twice due to widget initialization being done twice caused by recursion of WidgetFactory::createWidget() in the case of a fallback to promotion when a custom widget plugin is missing. Task-number: QTBUG-18121 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
| | | * | | Designer: Fix a bug clearing the Z-Order when adding a new widget.Friedemann Kleint2011-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong list was used when adding widgets. Task-number: QTBUG-18120 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-1010-31/+31
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bump Qt version to 4.7.3
| | | * | | | Bump Qt version to 4.7.3Timo Turunen2011-03-0910-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-03-081-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed unescaped backslashes in testcase.prf Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf Revert "Backporting TESTARGS feature from 4.7" Backporting TESTARGS feature from 4.7 Update copyright year to 2011. embed copyright information in QtAssistantClient4.dll
| | | * \ \ \ \ Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2011-03-081-1/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qttest_p4.prf src/script/utils/qscriptdate.cpp src/script/utils/qscriptdate_p.h tests/auto/qscriptvalue/testgen/testgenerator.cpp tests/auto/qscriptvalue/tst_qscriptvalue_generated.cpp
| | | | * | | | | Update copyright year to 2011.Jason McDonald2011-01-101182-1193/+1193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-22 08:30:18 (GMT)