summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-043-5/+44
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtAaron Kennedy2009-07-311-1/+1
| |\
| | * parse Q_INVOKABLE explicit constructorsOlivier Goffart2009-07-301-1/+1
| * | Remove isDynamic property flagAaron Kennedy2009-07-311-2/+1
| * | Reorder flag values in ascending orderAaron Kennedy2009-07-311-3/+4
| * | Dynamic meta object supportAaron Kennedy2009-07-311-3/+6
| * | Add FINAL attribute to Q_PROPERTY()Aaron Kennedy2009-07-313-2/+9
| * | Add CONSTANT attribute to Q_PROPERTY()Aaron Kennedy2009-07-313-2/+31
| |/
* | Merge commit 'qt/master-stable'Jason Barron2009-07-276-81/+42
|\ \ | |/
| * Fix Warning saying that signal cannot be made virtualOlivier Goffart2009-07-221-11/+9
| * make the boostrap lib work for projects that aren't in src/toolsJoerg Bornemann2009-07-201-10/+10
| * general wording change for some file type namesFrederik Schwarzer2009-07-063-7/+7
| * src/tools/idc: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT...miniak2009-07-011-53/+16
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3075-162/+184
|\ \ | |/
| * Merge branch '4.5'Thiago Macieira2009-06-261-2/+2
| |\
| | * make invokable constructors work with classes in namespaceKent Hansen2009-06-251-2/+2
| * | 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 commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2517-104/+461
|\ \ \ | |/ /
| * | Only include QMetaType if required in moc generated filesOlivier Goffart2009-06-112-3/+8
| * | 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
| * | improved string operations all over the placeThierry Bastian2009-05-2813-95/+95
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-7/+7
| |\ \ | | |/
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-171-8/+8
| |\ \
| * | | Long live Qt!Lars Knoll2009-03-2388-0/+38532
| / /
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-061-7/+7
|\ \ \ | | |/ | |/|
| * | Fix crash in uic regarding setting QIconJarek Kobus2009-04-281-7/+7
| |/
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-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 for S60!axis2009-04-2488-0/+38197