summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-202-30/+27
|\
| * Fixed handling of indented snippet markers.David Boddie2010-12-202-30/+27
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-201-1/+7
|\ \ | |/ |/|
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-181-1/+7
| |\
| | * Use relative include instead of absolute in default qmake.confMiikka Heikkinen2010-12-171-1/+7
* | | Removed obsolete configuration options.David Boddie2010-12-172-10/+0
* | | Updated the offline template to use a new offline style sheet.David Boddie2010-12-172-17/+10
* | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-171-1/+2
|\ \ \ | |/ /
| * | qdoc: Added typedef to help the OSX compiler accept a template.Martin Smith2010-12-161-1/+2
| * | Merge branch '4.7' into mimirDavid Boddie2010-12-1511-48/+60
| |\ \ | | |/
* | | Whitespace fixes.David Boddie2010-12-171-1/+1
* | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1511-48/+60
|\ \ \ | |/ / |/| / | |/
| * Build on SymbianMartin Jones2010-12-121-13/+13
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-118-41/+41
| |\
| | * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-104-7/+7
| | * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-106-18/+18
| | * QmlViewer: Fix crash on exitKai Koehne2010-12-101-21/+21
| * | refuse to open empty translation filesOswald Buddenhagen2010-12-101-0/+7
| |/
| * Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-0/+2
| * Check Qt::WA_TranslucentBackground instead of custom widget property.Michael Dominic K2010-12-082-21/+2
| * New translucency API for the meego graphics system.Michael Dominic K2010-12-082-0/+22
* | Treat div elements like paragraphs.David Boddie2010-12-141-0/+3
* | Removed macros for figures and floats. We'll use \div...\enddiv instead.David Boddie2010-12-141-32/+0
* | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1416-81/+131
|\ \
| * | Added macros for floating images and floating images with alt text.David Boddie2010-12-131-0/+32
| * | Fixed macro argument handling.David Boddie2010-12-131-5/+42
| * | Removed trailing whitespace.David Boddie2010-12-131-25/+25
| * | Ensured that object definition identifiers are marked up as links.David Boddie2010-12-092-4/+13
| * | Added hack to remove markup for opened comments at the end of snippets.David Boddie2010-12-091-0/+4
| * | Removed redundant style information and images.David Boddie2010-12-094-53/+10
| * | Used a different style class for areas containing QML markup.David Boddie2010-12-091-1/+1
| * | Use the same style of qmake variable referencing used elsewhere in Qt.David Boddie2010-12-081-2/+2
| * | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-074-15/+26
| |\ \ | | |/
| | * Synchronized configure.exe OpenGL options with Unix configureOleh Vasyura2010-12-031-2/+23
| | * purge vestiges of imageformat-pluginsMark Brand2010-12-032-10/+0
| | * Give qmlviewer a minimum size if root object has no size.Bea Lam2010-12-031-1/+1
| | * Fix Browser.qml warningsJoona Petrell2010-11-301-2/+2
* | | qdoc: Changed index.qdoc to use new \div commandMartin Smith2010-12-147-6/+44
* | | doc: Fixed the \raisedaster macro to write the <sup> element.Martin Smith2010-12-091-0/+5
* | | doc: Removed the \hr macro from the DITA XML qdocconf file.Martin Smith2010-12-091-1/+1
* | | qdoc: Updated signature of generateInnerNode() in the XML generator.Martin Smith2010-12-093-8/+13
* | | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2010-12-08156-11284/+4843
|\ \ \
| * | | Updated the DITA configuration to use the new configuration structure.David Boddie2010-12-071-1/+1
| * | | Updated the DITA generator to use the modified generator API.David Boddie2010-12-071-1/+1
| * | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-07155-11282/+4841
| |\ \ \ | | |/ /
| | * | Added missing qmlcodemarker.cpp and qmlcodemarker.h files.David Boddie2010-12-067-25/+523
| | * | Forced the \qml command to use the QML code marker.David Boddie2010-12-061-2/+3
| | * | Removed QDebug includes.David Boddie2010-12-063-4/+0
| | * | Minor housekeeping changes.David Boddie2010-12-031-1/+1
| | * | Added a specialized version of the QML code marker for JavaScript files.David Boddie2010-12-024-0/+207