summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doc: Removed the \hr macro from the DITA XML qdocconf file.Martin Smith2010-12-091-1/+1
* doc: Removed some empty \row commands from a table.Martin Smith2010-12-091-3/+0
* 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-081884-86830/+98256
|\
| * 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-071883-86828/+98254
| |\
| | * Doc: Added new style colors, increased the contrast of existing colors.David Boddie2010-12-071-3/+18
| | * Merge branch 'qdoc-simplified' of ../qt-doc-team-qdoc-simplified into qdoc-si...David Boddie2010-12-061099-22551/+48928
| | |\
| | | * 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
| | | * Updated handling of some statement nodes, removed unnecessary functions.David Boddie2010-12-012-669/+28
| | | * Fixed/adjusted handling of UiPublicMember nodes.David Boddie2010-12-012-199/+5
| | | * Trivial comment fix.David Boddie2010-12-011-1/+1
| | | * Select the appropriate code marker for each file.David Boddie2010-12-012-3/+9
| | | * Removed an unused function.David Boddie2010-12-011-15/+0
| | | * Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-11-301061-21312/+46003
| | | |\
| | | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-295-13/+55
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-295-13/+55
| | | | | |\
| | | | | | * Removed some new warnigs.Alessandro Portale2010-11-291-3/+2
| | | | | | * Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-292-2/+33
| | | | | | * Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-292-8/+20
| | | | | |/
| | | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-282-2/+3
| | | | |\ \ | | | | | |/
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-282-2/+3
| | | | | |\
| | | | | | * Autotest: fix mistake in verifying pointersThiago Macieira2010-11-281-2/+2
| | | | | | * Remove the FIXME, it's fixedThiago Macieira2010-11-281-1/+1
| | | | | | * Fix warning about uninitialised varibale.Thiago Macieira2010-11-281-0/+1
| | | | | |/
| | | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-2730-229/+325
| | | | |\ \ | | | | | |/
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-274-78/+76
| | | | | |\
| | | | | | * Phonon: Fix use of ASCII casting in the PulseAudio support.Thiago Macieira2010-11-261-74/+72
| | | | | | * Phonon: Fix unused parameter warningThiago Macieira2010-11-261-1/+1
| | | | | | * Phonon: Fix warning on casting from "false" to QFlags.Thiago Macieira2010-11-261-2/+2
| | | | | | * Phonon: Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2723-146/+244
| | | | | |\ \
| | | | | | * | Fix strict-aliasing violation warning.Thiago Macieira2010-11-261-1/+9
| | | | | | * | Fix warning about %x parameter type mismatch in EGLThiago Macieira2010-11-261-1/+1
| | | | | | * | Fix warning about address of a function being constant.Thiago Macieira2010-11-261-0/+4
| | | | | | * | Fix warnings related to unused variables.Thiago Macieira2010-11-268-5/+11
| | | | | | * | Fix silly "will be initialised after" warning.Thiago Macieira2010-11-261-1/+1
| | | | | | * | Fix warning about mixing integral with non-integral type in ?:Thiago Macieira2010-11-261-2/+2
| | | | | | * | Fix warning about use of uninitialised variableThiago Macieira2010-11-261-1/+1
| | | | | | * | Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| | | | | | * | Fix warnings with GCC 4.5: some cases are not part of the enumThiago Macieira2010-11-261-2/+2
| | | | | | * | Fix a race condition related to service acquisition.Thiago Macieira2010-11-263-9/+108
| | | | | | * | QNetworkReply autotest: fix possible crashPeter Hartmann2010-11-261-0/+1
| | | | | | * | QKqueueFileSystemWatcher: don't stop thread that isn't runningJoão Abecasis2010-11-262-0/+3
| | | | | | * | Fix QSettings auto test to use QTRY_VERIFYJoão Abecasis2010-11-261-8/+5