summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-04-2829-1267/+1276
|\
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2811-11/+11
| |\
| | * Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-2811-11/+11
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-277-119/+169
| |\ \ | | |/
| | * fixes undefined behavior will closing all tabskh2009-04-276-116/+165
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-2732-265/+252
| | |\
| | * | Make dark color schemes look better in property editor (especially schemes wh...Jarek Kobus2009-04-271-3/+4
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-276-6/+6
| |\ \ \ | | | |/ | | |/|
| | * | Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-276-6/+6
| * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-255-114/+137
| |\ \ \ | | |/ /
| | * | fixes empty tab titles after restartkh2009-04-242-14/+10
| | * | cleanup, no functional changekh2009-04-243-94/+118
| | * | init combobox member and make sure we won't access it uninitializedkh2009-04-241-6/+9
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-243-3/+6
| |\ \ \ | | |/ /
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-243-3/+6
| * | | Merge branch '4.5'Thiago Macieira2009-04-241-1/+1
| |\ \ \ | | |/ /
| | * | Change Qt version number to 4.5.2Thiago Macieira2009-04-247-11/+11
| * | | Remove the Direct3D engine.Gunnar Sletta2009-04-241-57/+2
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-233-68/+22
| |\ \ \ | | |/ /
| | * | cleanupkh2009-04-233-68/+22
| * | | Merge branch '4.5'Thiago Macieira2009-04-236-32/+57
| |\ \ \ | | |/ /
| | * | fixes open an empty page on invalid keywordkh2009-04-231-0/+2
| | * | make sure we wait until the page has fully loaded before duplicatingkh2009-04-233-1/+19
| | * | update the filter combobox if we set a passed filterkh2009-04-231-2/+11
| | * | use qdoc3 debug version only when it is availableJoerg Bornemann2009-04-231-7/+0
| | * | Set the current filter if one gets passed by commandline.kh2009-04-231-0/+3
| | * | cleanup, normalized connect, etc...kh2009-04-231-24/+24
| * | | Make BGR mode configurable through the GUIPaul Olav Tvete2009-04-231-0/+2
| * | | Add BGR format to qvfbPaul Olav Tvete2009-04-233-1/+19
| * | | Adding 2bpp support to qvfbPaul Olav Tvete2009-04-233-864/+855
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-236-12/+10
| |\ \ \ | | |/ /
| | * | Make all qdoc footers consistent with the main Qt docs.Jason McDonald2009-04-226-12/+10
| * | | Remove git merge conflict markersSimon Hausmann2009-04-222-2/+0
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-04-283-1/+491
|\ \ \ \
| * | | | Handle Connection objects.Roberto Raggi2009-04-271-13/+68
| * | | | removed most featuresmae2009-04-241-10/+17
| * | | | Updated the QML converter.Roberto Raggi2009-04-241-10/+5
| * | | | experiment with treating State and Transition slightly special: they are auto...mae2009-04-241-4/+4
| * | | | small cleanupsmae2009-04-241-2/+11
| * | | | map the ParentChange qml tag to a ParentChangeSet in dui.mae2009-04-241-13/+31
| * | | | finalize support for namespacepathmae2009-04-241-2/+10
| * | | | qmlconv does not need to be a bundle app.Roberto Raggi2009-04-241-1/+1
| * | | | load foo.js for a foo.dui if it exists. This lets us use the import keyword f...mae2009-04-241-1/+3
| * | | | imported qmlconv utility for conveniencemae2009-04-243-1/+397
* | | | | qdoc: Corrected a few qdoc warnings.Martin Smith2009-04-282-14/+20
|/ / / /
* | | | Make the documentation build.Alexis Menard2009-04-232-2/+0
* | | | Change the QML element docs filename prefix "qml-" rather than "qml".Martin Jones2009-04-232-5/+5
* | | | Merge in changes to old kinetic-dui branch.Michael Brasser2009-04-234-8/+31
* | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-2223-144/+32
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5'Rhys Weatherley2009-04-2114-19/+15
| |\ \ \ | | |/ /