summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Removed support for static linking of QtWebKit.Simon Hausmann2010-06-231-0/+5
| | * 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
| | * | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-3/+41
| * | | 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/oslo-staging-1 into 4.7David Boddie2010-06-218-42/+168
| |\ \ | | |/
| | * 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
| | |/
| * | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-2111-275/+121
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-183-72/+59
| |\
| * | doc: Added more DITA output to the XML generatorMartin Smith2010-06-183-5/+47
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ...David Boddie2010-06-187-88/+313
|\ \ \ | | |/ | |/|
| * | 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
| |\ \ | | |/
| | * 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
| | |\
| | * | doc: Added more DITA output to the XML generatorMartin Smith2010-06-164-16/+160
| * | | 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
* | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
| |_|_|/ |/| | |
* | | | 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 git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-155-28/+32
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1520-803/+1284
| | |\
| * | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-154-446/+178
| | |/ | |/|
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1156-361/+1750
| |\ \
| | * | make postgresql support sensitive to PSQL_LIBSMark Brand2010-06-102-0/+5
| | * | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-103-3/+3
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0910-51/+504
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0910-51/+504
| | | |\ \
| | | | * | designer: add sorting in signal-slot editor windowMarek Wieckowski2010-06-092-3/+9
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-088-48/+495
| | | | |\ \
| | | | | * | Doc: Fixed whitespace in the other configuration file for zh_CN.David Boddie2010-06-071-22/+22
| | | | | * | Doc: Fixed whitespace in the Simplified Chinese doc configuration.David Boddie2010-06-071-26/+26
| | | | | * | * Add Japanese tutorial documentsTakumi ASAKI2010-06-078-0/+447
| * | | | | | doc: Added DITA XML generatorMartin Smith2010-06-115-749/+772
* | | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | qmlviewer: ensure that only clicks on the current file list are handled.Martin Jones2010-06-091-1/+1