summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-241-316/+306
|\
| * Merge branch '4.7' into mimirMorten Engvoldsen2011-02-231229-2094/+6243
| |\
| * | qdoc: More updating command descriptions.Martin Smith2011-02-231-25/+74
| * | qdoc: More updating command descriptions.Martin Smith2011-02-231-34/+11
| * | qdoc: More updating command descriptions.Martin Smith2011-02-231-257/+221
* | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-238-53/+104
|\ \ \ | |_|/ |/| |
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-22123-14417/+7766
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-201-3/+7
| | |\ \
| | | * | Attempt to fix symbian 3.1 and 3.2 compile break.Jason McDonald2011-02-181-3/+7
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-181-1/+1
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-141-2/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Designer: Slots of main container not visible in signal/slot editor.Friedemann Kleint2011-02-112-3/+12
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-093-29/+66
| | |\ \ \ \
| | | * | | | Fix regression in creating mkspecs/defaultMiikka Heikkinen2011-02-093-29/+66
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-083-15/+22
| | |\ \ \ \ \
| | | * | | | | Fix the compilation error that the previous fix didn't fixThiago Macieira2011-02-081-1/+1
| | | * | | | | Fix compilation error: symbol is namespaced.Thiago Macieira2011-02-081-0/+2
| | | * | | | | Make qdbus show all types, even those that it doesn't know aboutThiago Macieira2011-02-061-2/+9
| | | * | | | | Designer: Fix a crash in the Signal-Slot-Editor.Friedemann Kleint2011-02-042-13/+11
| | | |/ / / /
| * | | | | | Another stab at fixing compilation on old Symbian platformsJoona Petrell2011-02-222-5/+3
| | |_|_|/ / | |/| | | |
| * | | | | Fix compilation on old Symbian platformsJoona Petrell2011-02-181-1/+1
| | |_|/ / | |/| | |
| * | | | Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-111-2/+2
* | | | | Merge branch 'mimir' into 4.7David Boddie2011-02-237-4999/+4877
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-111/+80
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-89/+71
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-20/+15
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-83/+77
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-86/+72
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-177/+169
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-211-100/+101
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-211-140/+67
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-211-98/+74
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-211-211/+145
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-181-64/+51
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-181-121/+112
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-181-317/+280
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-181-313/+314
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-171-134/+127
| * | | | qdoc: More updating command descriptions.Martin Smith2011-02-171-151/+135
| * | | | qdoc: More updating of the command descriptions. \caption implemented.Martin Smith2011-02-171-136/+147
| * | | | qdoc: Began updating the command descriptions.Martin Smith2011-02-171-76/+72
| * | | | qdoc: Moved a lot of \target commands to be above the header.Martin Smith2011-02-161-196/+165
| * | | | qdoc: Updated the qdoc manual and its config file.Martin Smith2011-02-163-2072/+1862
| * | | | qdoc: Updated the qdoc manual.Martin Smith2011-02-012-285/+48
| * | | | qdoc: Fixed numerous broken links in the qdoc manual.Martin Smith2011-01-311-43/+45
| * | | | qdoc: Fixed numerous broken links in the qdoc manual.Martin Smith2011-01-311-740/+740
| * | | | qdoc: Updated the qdoc manual and its qdocconf file.Martin Smith2011-01-282-227/+95
| * | | | qdoc: Updated the qdoc manual.Martin Smith2011-01-281-12/+30
| * | | | qdoc: Updated the qdoc manual.Martin Smith2011-01-281-10/+241
| * | | | qdoc: Added the \span command.Martin Smith2011-01-246-42/+85