summaryrefslogtreecommitdiffstats
path: root/tools/shared
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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-0/+3
|\ \ | |/
| * Fix warnings related to unused variables.Thiago Macieira2010-11-261-0/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-255-74/+115
|\ \ | |/
| * Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-195-20/+56
| * Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-181-0/+11
| * Make epocroot resolving compatible with more build environmentsMiikka Heikkinen2010-11-182-57/+51
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-18/+26
|\ \ | |/
| * QString usage cleanupsOswald Buddenhagen2010-09-011-12/+12
| * Designer: Fix crash on unsupported Language/Country combination.Friedemann Kleint2010-08-301-6/+14
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-47/+47
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-061-44/+44
|/
* Change $${EPOCROOT} to also have drive if EPOCROOT env variable has itMiikka Heikkinen2010-06-151-4/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1922-426/+0
|\
| * Remove obsolete and broken qvfb skins.Jason McDonald2010-05-1922-426/+0
* | Support device aliases in EPOCDEVICEMiikka Heikkinen2010-05-141-3/+6
|/
* compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-231-1/+1
* Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-232-0/+297
* Factored readRegistryKey implementation out of qmakeaxis2010-02-232-0/+225
* Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-212-225/+0
* Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-212-297/+0
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-204-0/+522
|\
| * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-192-0/+297
| * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-192-0/+225
| * Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-192-225/+0
| * Revert "Factored epocRoot implementation out of qmake"axis2010-02-192-297/+0
| * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-182-0/+297
| * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-182-0/+225
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-123-38/+61
|\ \ | |/
| * Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..Friedemann Kleint2010-02-103-38/+61
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-042-2/+2
|\ \ | |/
| * Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-012-2/+2
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-014-5/+5
|\ \ | |/
| * Designer: Fix source code scanning issues.Friedemann Kleint2010-01-284-5/+5
* | Merge branch '4.6'Thiago Macieira2010-01-1355-55/+55
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0755-55/+55
| |\
| | * Update copyright year to 2010Jason McDonald2010-01-0655-55/+55
* | | Merge branch '4.6'Thiago Macieira2010-01-084-19/+53
|\ \ \ | |/ /
| * | Designer: Enable seconds editing for Q[Date]TimeEdit's properties.Friedemann Kleint2010-01-044-19/+53
| |/
* | Merge branch '4.6'Thiago Macieira2009-11-2513-478/+478
|\ \ | |/
| * Ran the script utils/normalizeOlivier Goffart2009-11-1813-478/+478
* | Assistant/Designer: Fix handling of oblique font styles.ck2009-11-161-2/+6
|/
* Fix alpha setting in Designer's "Edit Palette" windowFriedemann Kleint2009-09-162-12/+6
* Update license headers again.Jason McDonald2009-09-0955-220/+220
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3155-715/+715
|\
| * Update tech preview license header.Jason McDonald2009-08-3155-715/+715
| * Update license headers.Jason McDonald2009-08-1155-55/+55
* | Merge commit 'qt/master'Jason Barron2009-08-1355-55/+55
|\ \
| * | Update contact URL in license headers.Jason McDonald2009-08-1255-55/+55