summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-06-1975-160/+182
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-162-10/+29
| |\
| | * Prevent uic3 from clobbering the QLabel3::wordWrap property.Friedemann Kleint2009-06-161-7/+10
| | * Made uic generate QLayout::setContentsMargin instead of setMargin.Friedemann Kleint2009-06-161-3/+19
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-1675-150/+150
| |\ \ | | |/ | |/|
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1675-150/+150
| * | Add detailed warning when idc fails.Prasanth Ullattil2009-06-151-0/+3
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-112-3/+8
|\ \ \ | |/ /
| * | Only include QMetaType if required in moc generated filesOlivier Goffart2009-06-112-3/+8
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-093-6/+18
|\ \ \ | |/ /
| * | make moc-generated code compile againKent Hansen2009-06-081-0/+2
| * | handle qreal properties correctly in the meta-object systemKent Hansen2009-06-052-6/+16
* | | Revert "Naively fix handling of qreal properties for ARM."Michael Brasser2009-06-081-6/+0
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-2913-95/+95
|\ \ \ | |/ /
| * | improved string operations all over the placeThierry Bastian2009-05-2813-95/+95
* | | Naively fix handling of qreal properties for ARM.Michael Brasser2009-05-221-0/+6
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-051-7/+7
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-7/+7
| |\ \ | | |/
| | * Fix crash in uic regarding setting QIconJarek Kobus2009-04-281-7/+7
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-226-83/+115
|/ /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-171-8/+8
|\ \ | |/
| * Fix management of svg iconsJarek Kobus2009-04-171-8/+8
| * Long live Qt 4.5!Lars Knoll2009-03-2388-0/+38192
* Long live Qt!Lars Knoll2009-03-2388-0/+38532