summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* fix detection of relative location informationOswald Buddenhagen2011-04-111-5/+7
| | | | | | | | | an empty line number does not indicate relative loc info - it may be the result of -no-ui-lines. instead, an empty file name does indicate it - no file name at all makes no sense, so this means a previous messages has set it already. and we need this additional detection, as the entire ts file may have no line number info to base the decision on at all.
* make -markuntranslated work without -idbasedOswald Buddenhagen2011-04-081-1/+1
| | | | Task-number: QTBUG-18625
* fix conditional on shell typeOswald Buddenhagen2011-04-081-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-04-0137-243/+13504
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (45 commits) Removed mobile demos from the Symbian build in demos.pro Fixed demo subdirs for mobile examples. qdoc: Updates to the qdoc manual. Moved a couple of links into one list. Doc: Work on GettingStartedQt tutorial Added a link to the Debugging Techniques article. qdoc: Updates to the qdoc manual. qdoc: Added a way to exclude directories from receiving default metadata Edited the Tutorials and Examples pages. Renamed links in index.qdoc. Doc: Update to QStyledItemDelegate::displayText() qdoc: Added default values to config file for DITA Doc: Work on QAudioInput::start() functions. Avoided the use of hard-coded file names. Copied the declarative parser into qdoc3 to avoid dependency issues. qdoc: Don't wrap <image> in <fig> if in an <xref> Doc: Work on a11y docs qdoc: Added <copyright>, <copyryear>, and <copyrholder>. qdoc: Completed metadata handling. Doc: Small update to QImageReader/Writer::supportedImageFomrmats() Edited QtWebKit Guide qdoc and added external links. ...
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-302-34/+39
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-281-53/+38
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-282-34/+39
| | |\ \
| * | | | qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| | |_|/ | |/| |
| * | | qdoc: Updates to the qdoc manual.Martin Smith2011-03-281-53/+38
| |/ /
| * | 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
| |\ \
| | * | 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: 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
| * | 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.
| * | | | | qdoc: Completed metadata handling.Martin Smith2011-03-248-126/+152
| | |_|/ / | |/| | | | | | | | | | | | | But not the default values part in the config file.
* | | | | fix configure.exe option -opengl desktopMark Brand2011-03-311-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17997 Merge-request: 1161 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | 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 ...
| * | | 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
| * | | | qdoc: Avoid infinite loops in table of contents generation.David Boddie2011-03-211-1/+4
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-184-183/+185
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | qdoc: Added the <othermeta> element.Martin Smith2011-03-183-1/+30
| | | | |
| | * | | qdoc: Completed changing <section> structure.Martin Smith2011-03-172-182/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There appears to be a design flaw in the DITA language in that it doesn't allow the <title> element to appear inside a <bodydiv> <sectiondiv>.
| * | | | Removed the documentation from the install rule.David Boddie2011-03-181-1/+1
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-153-205/+264
| |\ \ \ \ | | |/ / /
| | * | | qdoc: Changed <section> structure.Martin Smith2011-03-153-205/+264
| | | |/ | | |/| | | | | | | | | | | | | | | | | There appears to be a design flaw in the DIKT language in that it doesn't allow the <title> element to appear inside a <bodydiv> <sectiondiv>.
| * | | Doc: Fixed typo.David Boddie2011-03-151-1/+1
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-144-14/+78
| |\ \ \ | | |/ /
| | * | qdoc: Added <publisher> and <permissions> elements.Martin Smith2011-03-103-9/+45
| | | |
| | * | qdoc: Added <component> element to contain the module name.Martin Smith2011-03-101-1/+6
| | | |
| | * | qdoc: Added <prodinfo> element and its contents to the metadata.Martin Smith2011-03-092-5/+28
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-084-10/+162
| |\ \ \ | | |/ /
| | * | qdoc: Added Author> and <category> elements to the metadata.Martin Smith2011-03-074-25/+103
| | | |
| | * | qdoc: Added enum values and tag names for <prolog> and <metadata>Martin Smith2011-03-042-6/+81
| | | | | | | | | | | | | | | | These contain many subelements, whose tages were also added.
| | * | qdoc: Removed debug code.Martin Smith2011-03-021-1/+0
| | | |
| * | | Fixed invalid HTML output.David Boddie2011-03-031-1/+1
| |/ /
| * | Merge branch 'mimir' into 4.7Martin Smith2011-03-012-1595/+1739
| |\ \
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-138/+156
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-239/+284
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-132/+126
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-8/+69
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-15/+95
| | | |
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-251-10/+29
| | | |