summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/lib/uilib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1722-22/+22
|\
| * Update copyright year to 2011.Jason McDonald2011-01-1022-22/+22
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-252-10/+10
|\ \ | |/
| * Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-042-10/+10
* | Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-223-5/+96
* | Designer/QFormBuilder::save(): Fix traversal of QGridLayout/QFormLayoutFriedemann Kleint2010-09-231-28/+95
* | Designer/uic: Start on support for QIcon::fromTheme().Friedemann Kleint2010-09-083-0/+30
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-063-30/+30
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-063-8/+8
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-211-1/+16
|\
| * Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.Friedemann Kleint2010-06-211-1/+16
* | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-212-50/+22
|/
* Apply the stdset attribute for resource propertiesJarek Kobus2010-03-151-3/+8
* Designer: Fix source code scanning issues.Friedemann Kleint2010-01-282-2/+2
* Update copyright year to 2010Jason McDonald2010-01-0622-22/+22
* uic/Designer: Use correct margin defaults for custom page-based containers.Friedemann Kleint2009-11-104-51/+62
* Update license headers again.Jason McDonald2009-09-0922-88/+88
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-312-26/+26
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3120-260/+260
|\
| * Update tech preview license header.Jason McDonald2009-08-3120-260/+260
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-241-7/+0
|\ \ | |/
| * remove dead codeOswald Buddenhagen2009-08-141-7/+0
| * Update license headers.Jason McDonald2009-08-1120-20/+20
* | Merge commit 'qt/master'Jason Barron2009-08-211-0/+1
|\ \
| * | make Qt Designer compile when Qt is configured with -no-scriptKent Hansen2009-08-191-0/+1
* | | Merge commit 'qt/master'Jason Barron2009-08-182-0/+495
|\ \ \ | |/ /
| * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-172-0/+495
* | | Merge commit 'qt/master'Jason Barron2009-08-1320-20/+20
|\ \ \ | |/ /
| * | Update contact URL in license headers.Jason McDonald2009-08-1220-20/+20
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-272-9/+9
|\ \ \ | |/ /
| * | general wording change for some file type namesFrederik Schwarzer2009-07-062-9/+9
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3020-40/+40
|\ \ \ | |/ /
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-1620-40/+40
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1620-40/+40
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-256-25/+375
|\ \ \ | |/ /
| * | Enable overriding of the factory functions of QUiLoader.Friedemann Kleint2009-05-294-20/+28
| * | Call QFormBuilderExtra::instance lessJoão Abecasis2009-05-291-4/+6
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-171-8/+8
| |\ \ | | |/
| * | Long live Qt!Lars Knoll2009-03-2322-0/+21711
| /
* | 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-2322-0/+21371
* Long live Qt for S60!axis2009-04-2422-0/+21530