summaryrefslogtreecommitdiffstats
path: root/tools/designer/src/components
Commit message (Expand)AuthorAgeFilesLines
* Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-062-2/+2
* Merge commit 'origin/master'Jason Barron2009-08-042-2/+2
|\
| * Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-032-2/+2
* | Merge commit 'qt/master-stable'Jason Barron2009-07-273-9/+12
|\ \ | |/ |/|
| * Merge commit 'origin/4.5'Olivier Goffart2009-07-221-2/+5
| |\
| | * Designer: Fixed bug in setting QUrl property values from resources.Friedemann Kleint2009-07-221-2/+5
| * | general wording change for some file type namesFrederik Schwarzer2009-07-061-3/+3
| * | fix column-spanning in Designer ConnectDialog's layoutRitt Konstantin2009-06-301-4/+4
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30187-376/+389
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-06-241-2/+2
| |\ \ | | |/
| | * fix crash when using plugin that supplies a QDesignerMemberSheetExtensionJoel Nordell2009-06-241-2/+2
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-231-0/+3
| |\ \ | | |/
| | * Fix crash in widget box when using load mode "LoadCustomWidgetsOnly"Eskil Abrahamsen Blomfeldt2009-06-221-0/+3
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-161-0/+10
| |\ \
| | * | Store promoted Widgets correctly in the ScratchPad.Friedemann Kleint2009-06-161-0/+10
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16187-374/+374
| |\ \ \ | | |/ / | |/| / | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-16187-374/+374
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2538-272/+10
|\ \ \ | |/ /
| * | Merge branch '4.5'Tom Cooksey2009-05-281-12/+22
| |\ \ | | |/
| * | Fixed crash when encountering invalid forms.Friedemann Kleint2009-05-261-1/+4
| * | Enabled the use of promoted widgets in new form templates.Friedemann Kleint2009-05-221-120/+1
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-182-3/+6
| |\ \
| * \ \ Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-271-3/+4
| |\ \ \
| * | | | Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| * | | | Long live Qt!Lars Knoll2009-03-23374-0/+44570
| / / /
* | | | Make Qt exception safer.Robert Griebl2009-06-104-9/+4
| |_|/ |/| |
* | | BT: Support saving forms with resources more than once in Qt JambiEskil Abrahamsen Blomfeldt2009-05-281-12/+22
| |/ |/|
* | Fixed a bug caused by forms with a sizepolicy of 'Fixed' on the main container.Friedemann Kleint2009-05-182-3/+6
|/
* Make dark color schemes look better in property editor (especially schemes wh...Jarek Kobus2009-04-271-3/+4
* Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
* Long live Qt 4.5!Lars Knoll2009-03-23374-0/+44716