summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* warn about stray meta dataOswald Buddenhagen2010-06-291-4/+7
* don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-291-0/+3
* fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-289-77/+131
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2812-88/+306
| |\
| * \ Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-2523-373/+563
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-236-20/+173
| | |\ \
| | * | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ...David Boddie2010-06-187-88/+313
| |\ \ \ \
| * | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
* | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
| |_|_|_|/ |/| | | |
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-281-0/+8
* | | | | Fixed copy-paste error in htmlgenerator.cppRohan McGovern2010-06-261-1/+1
* | | | | Doc: fixing search bugMorten Engvoldsen2010-06-252-3/+15
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-252-8/+66
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-255-2/+16
|\ \ \ \ \
| * | | | | We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| * | | | | Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| | |_|_|/ | |/| | |
| * | | | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-231-0/+5
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-255-76/+207
|/ / / /
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-221-0/+4
|\ \ \ \
| * | | | Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-223-8/+71
|/ / / /
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-1/+45
* | | | Finish merge conflict.Martin Smith2010-06-2215-284/+129
|\ \ \ \
| * | | | qdoc3: Build fix for regression in f321a3f2b1eAndreas Kling2010-06-222-4/+4
| * | | | qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-223-6/+5
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-218-42/+168
| |\ \ \
| * | | | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-2111-275/+121
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-3/+41
| |/ / / |/| | |
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-214-19/+34
|\ \ \ \
| * | | | Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.Friedemann Kleint2010-06-211-1/+16
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-06-214-18/+60
| |\ \ \ \
| * | | | | Doc: Fixing bugs to style and scriptMorten Engvoldsen2010-06-213-18/+18
| | |/ / / | |/| | |
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-212-5/+74
| |/ / / |/| | |
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-214-18/+60
|/ / /
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-183-72/+59
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-176-18/+278
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-163-72/+59
| |\ \ \
| | * | | Fix the N900 device orientation backendHarald Fernengel2010-06-162-68/+56
| | * | | Micro cleanupHarald Fernengel2010-06-161-4/+3
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-183-5/+47
| |_|/ / |/| | |
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-172-11/+105
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-163-6/+24
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix some kind of race condition while using remote commands.kh12010-06-162-2/+24
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1522-1178/+1391
| |\ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-151-4/+0
| |\ \
| | * | Change $${EPOCROOT} to also have drive if EPOCROOT env variable has itMiikka Heikkinen2010-06-151-4/+0
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-164-16/+160
| |_|/ |/| |
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-155-28/+32
|\ \ \