summaryrefslogtreecommitdiffstats
path: root/tools/designer/src
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-01555-667/+666
|\
| * Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-07553-556/+556
| |\
| | * Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-061-2/+2
| | * Update copyright year to 2010Jason McDonald2010-01-06553-554/+554
| * | Designer: Selection handles disappear when using style sheet on form.Friedemann Kleint2010-01-041-2/+2
| |/
| * Designer: Fix compilation with -static on Mac OS XFriedemann Kleint2009-12-172-3/+16
| * Designer: Show actions in action editor in QKeySequence::NativeTextFriedemann Kleint2009-12-141-1/+1
| * Designer: Handle "visible"-properties of item view headers correctly.Friedemann Kleint2009-12-102-105/+88
| * Creator crashes when reloading externally modified .ui files on MacPrasanth Ullattil2009-12-011-0/+1
* | Merge branch '4.6'Thiago Macieira2009-11-2526-157/+176
|\ \ | |/
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1922-106/+114
| |\
| | * Ran the script utils/normalizeOlivier Goffart2009-11-1821-105/+105
| | * QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-181-1/+9
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-101-1/+1
| |\ \ | | |/
| * | uic/Designer: Use correct margin defaults for custom page-based containers.Friedemann Kleint2009-11-104-51/+62
* | | Designer: Filter on classname in Widget Box.Friedemann Kleint2009-11-161-5/+21
| |/ |/|
* | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-101-9/+10
|\ \ | |/
| * Designer: Use toolbar in Signal/Slot editorFriedemann Kleint2009-11-101-9/+10
* | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-061-1/+1
|/
* Designer: Fix potential crash when moving pages of a QTabWidgetFriedemann Kleint2009-10-271-0/+3
* Make menu editor work on Mac OS X.Friedemann Kleint2009-09-252-2/+11
* Removed empty line before the license header in qdesigner_utils_p.h.Kim Motoyoshi Kalland2009-09-211-1/+0
* Fix broken .ui file - class name was not specified correctly.Rhys Weatherley2009-09-171-1/+1
* Merge branch '4.5' into 4.6Tom Cooksey2009-09-171-38/+46
|\
| * Designer: tab order in DeviceProfileDialog correctedJoerg Bornemann2009-09-171-38/+46
| * Update license headers again.Jason McDonald2009-09-08543-2172/+2172
* | Fix alpha setting in Designer's "Edit Palette" windowFriedemann Kleint2009-09-161-5/+2
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-09552-2208/+2208
|\ \
| * | Update license headers again.Jason McDonald2009-09-09552-2208/+2208
* | | Took armcc_warnings.prf in use also for uitools build.Janne Anttila2009-09-091-2/+5
|/ /
* | compile since broken merge from 4.5Gunnar Sletta2009-09-031-1/+1
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-032-6/+1
|\ \
| * \ Merge branch '4.5' into 4.6Thiago Macieira2009-09-032-6/+1
| |\ \ | | |/
| | * Update license headers.Jason McDonald2009-09-022-6/+1
* | | Added missing TARGET.UID3 definitions to various components.Miikka Heikkinen2009-09-031-0/+1
|/ /
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-318-104/+104
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-31544-7072/+7072
|\ \ | |/
| * Update tech preview license header.Jason McDonald2009-08-31543-7059/+7059
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-242-7/+1
|\ \ | |/
| * Designer Preview window title not setKeith Isdale2009-08-241-0/+1
| * remove dead codeOswald Buddenhagen2009-08-141-7/+0
| * Qt's domain name is now qt.nokia.com.Jason McDonald2009-08-111-1/+1
| * Update license headers.Jason McDonald2009-08-11543-543/+543
* | Designer: Disable the Button group property editor for good.Friedemann Kleint2009-08-241-1/+1
* | Remove last vestiges of the qtusagereporter.Jason McDonald2009-08-241-14/+0
* | Merge commit 'qt/master'Jason Barron2009-08-217-3/+22
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-203-9/+5
| |\ \
| * | | make Qt Designer compile when Qt is configured with -no-scriptKent Hansen2009-08-197-3/+22
* | | | Merge commit 'qt/master'Jason Barron2009-08-203-9/+5
|\ \ \ \ | | |/ / | |/| |