summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2218-76/+159
|\
| * Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-214-43/+109
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-184-1/+39
| | |\
| | | * Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-184-1/+39
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-164-43/+71
| | |\ \ | | | |/
| | | * Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-164-43/+71
| * | | Bump Qt version to 4.7.4Timo Turunen2011-03-2110-29/+29
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-152-3/+5
| |\ \ | | |/
| | * Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| | * Designer: Fix a bug clearing the Z-Order when adding a new widget.Friedemann Kleint2011-03-151-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-1010-31/+31
| |\ \
| | * | Bump Qt version to 4.7.3Timo Turunen2011-03-0910-31/+31
| * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-03-081-1/+1
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2011-03-081-1/+1
| | |\ \ \
| | | * | | Update copyright year to 2011.Jason McDonald2011-01-101182-1193/+1193
| | | * | | embed copyright information in QtAssistantClient4.dllJoerg Bornemann2010-12-171-0/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-073-1/+14
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-073-1/+14
| | |/ / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-281-0/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
* | | | | 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
* | | | | | 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
* | | | | | 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
| * | | | | 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
| * | | | | qdoc: Began adding descriptions for QML commands.Martin Smith2011-02-252-4/+123
| * | | | | qdoc: More updating command descriptions.Martin Smith2011-02-251-769/+695
| * | | | | qdoc: More updating command descriptions.Martin Smith2011-02-241-169/+115
| * | | | | qdoc: More updating command descriptions.Martin Smith2011-02-241-210/+186
| * | | | | qdoc: More updating command descriptions.Martin Smith2011-02-241-133/+123
| * | | | | qdoc: More updating command descriptions.Martin Smith2011-02-241-113/+105