summaryrefslogtreecommitdiffstats
path: root/tests/auto/uic
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1759-59/+59
|\
| * Update copyright year to 2011.Jason McDonald2011-01-1059-59/+59
* | uic: Add autotests for layout alignmentFriedemann Kleint2010-10-222-0/+132
* | Designer/uic: Start on support for QIcon::fromTheme().Friedemann Kleint2010-09-082-0/+150
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-161-1/+1
|\
| * Bump version number after 4.6.3 release.Jason McDonald2010-06-151-1/+1
* | uic3: -extract: Write XPM-images correctly.Friedemann Kleint2010-03-262-0/+2
|/
* Bump version to 4.6.3.Jason McDonald2010-02-151-1/+1
* Fix copyright year.Jason McDonald2010-01-192-2/+2
* Bump version to 4.6.2.Jason McDonald2010-01-191-1/+1
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0757-57/+57
|\
| * Update copyright year to 2010Jason McDonald2010-01-0657-57/+57
* | uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroupDavid Faure2010-01-052-0/+2362
|/
* uic/Designer: Use correct margin defaults for custom page-based containers.Friedemann Kleint2009-11-101-1/+0
* Make the test work with shadow builds.Paul Olav Tvete2009-09-152-10/+10
* Update license headers again.Jason McDonald2009-09-0957-228/+228
* Generate Q_UNUSED(varName) only when varName was not used in retranslateUi(Cl...Jarek Kobus2009-09-04100-3146/+104
* Merge branch '4.5' into 4.6Thiago Macieira2009-09-0374-62/+3014
|\
| * Add missing license headers.Jason McDonald2009-09-0272-0/+2952
| * Update license headers.Jason McDonald2009-09-0256-1811/+1811
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3154-702/+702
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\ \ | |/
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update URL for Qt web site.Jason McDonald2009-08-1156-58/+58
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Autotest: update uic baselines after license header update.Thiago Macieira2009-08-18100-287/+342
* | Replace obsolete license headers.Jason McDonald2009-08-1255-1706/+1705
* | Update obsolete URL's in code and docs.Jason McDonald2009-08-1256-58/+58
* | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | Merge branch '4.5'Thiago Macieira2009-08-111-2/+3
|\ \ | |/
| * Tests: Make uic/uic3 use QLibraryInfo paths as do the linguist tests.Friedemann Kleint2009-08-061-1/+2
| * Tests: Make tools tests (rcc/moc/uic/uic3) run without X11-connection.Friedemann Kleint2009-08-061-1/+1
* | Tests: Adapted uic baseline to 33604fb02fa463f36fa78e515bb42a34a746f0f2Friedemann Kleint2009-08-06100-200/+200
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-1653-187/+187
|\ \ | |/ |/|
| * Made uic generate QLayout::setContentsMargin instead of setMargin.Friedemann Kleint2009-06-1653-187/+187
* | Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
|/
* Adapted uic test-baseline to the icon generation change 251248)Friedemann Kleint2009-05-151-6/+6
* Long live Qt 4.5!Lars Knoll2009-03-23205-0/+44082