summaryrefslogtreecommitdiffstats
path: root/src/tools/uic
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-263-2/+8
|\
| * uic: Use QString::fromUtf8 for QUrl properties.Friedemann Kleint2011-05-251-1/+1
| * uic: #include <QLayout> for QToolBox on non-laid-out forms.Friedemann Kleint2011-05-232-1/+7
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1332-545/+545
|/
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1732-32/+32
|\
| * Update copyright year to 2011.Jason McDonald2011-01-1032-32/+32
* | Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-223-0/+23
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-105-19/+47
|\ \ | |/
| * uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.Friedemann Kleint2010-09-081-1/+1
| * uic: Improve messages.Friedemann Kleint2010-09-071-6/+8
| * Tools (uic/rcc): Improve warning messages.Friedemann Kleint2010-09-075-17/+43
* | Designer/uic: Start on support for QIcon::fromTheme().Friedemann Kleint2010-09-084-21/+89
|/
* uic3: -extract: Write XPM-images correctly.Friedemann Kleint2010-03-264-6/+13
* uic: Fixed code generating setCentralWidget()-calls of QMainWindow.Friedemann Kleint2010-02-041-2/+3
* Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-011-3/+3
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0732-32/+32
|\
| * Update copyright year to 2010Jason McDonald2010-01-0632-32/+32
* | uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroupDavid Faure2010-01-051-3/+4
|/
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-191-2/+2
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-181-2/+2
* | uic: Call to setCentralWidget() not generated for promoted central widgets.Friedemann Kleint2009-11-161-1/+1
* | uic/Designer: Use correct margin defaults for custom page-based containers.Friedemann Kleint2009-11-105-3/+22
|/
* Update license headers again.Jason McDonald2009-09-0932-128/+128
* Generate Q_UNUSED(varName) only when varName was not used in retranslateUi(Cl...Jarek Kobus2009-09-042-2/+10
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3132-416/+416
|\
| * Update tech preview license header.Jason McDonald2009-08-3132-416/+416
| * Update license headers.Jason McDonald2009-08-1132-32/+32
* | Remove last vestiges of the qtusagereporter.Jason McDonald2009-08-241-15/+0
* | Update contact URL in license headers.Jason McDonald2009-08-1232-32/+32
* | Fix build warningHarald Fernengel2009-08-071-1/+1
* | Fix warnings on mingwThierry Bastian2009-08-061-3/+3
* | general wording change for some file type namesFrederik Schwarzer2009-07-061-2/+2
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-161-3/+19
|\ \
| * | Made uic generate QLayout::setContentsMargin instead of setMargin.Friedemann Kleint2009-06-161-3/+19
* | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1632-64/+64
|\ \ \ | |/ / |/| / | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1632-64/+64
* | improved string operations all over the placeThierry Bastian2009-05-282-5/+5
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-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/qtSimon Hausmann2009-04-171-8/+8
|\ \ | |/
| * Fix management of svg iconsJarek Kobus2009-04-171-8/+8
| * Long live Qt 4.5!Lars Knoll2009-03-2335-0/+22126
* Long live Qt!Lars Knoll2009-03-2335-0/+22466