summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-162-2/+7
|\
| * Updated project files so it is now possible to use "-system-zlib" configurati...Constantin Makshin2010-06-102-2/+7
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-151-4/+3
|\ \ | |/ |/|
| * fix detection of header filesDavid Fries2010-06-141-4/+3
* | fix escaping - by not using evalOswald Buddenhagen2010-05-271-8/+8
* | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-1/+2
* | uic3: -extract: Write XPM-images correctly.Friedemann Kleint2010-03-268-7/+20
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-224-5/+10
|\ \
| * | Moc: Add support for rvalue references in signals and slots.Thiago Macieira2010-03-222-3/+8
| * | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-193-4/+23
| |\ \
| * | | Force qt-zlib to be used for host system when cross compiling.Zeno Albisser2010-03-172-2/+2
* | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-227-28/+97
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Implement Q_PRIVATE_PROPERTY that allows you to declare propertiesAlexis Menard2010-03-197-28/+97
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-1/+0
|\ \ \ | | |/ | |/|
| * | Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-041-1/+0
* | | Added Symbian def file support to Linux build system.axis2010-03-082-2/+10
* | | Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-232-0/+11
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-161-1/+1
|\ \ \ | |/ /
| * | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-2/+3
| |\ \ | | |/
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-044-8/+10
| |\ \
| * \ \ Merge branch '4.6'Thiago Macieira2010-01-215-42/+42
| |\ \ \
| * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1376-81/+96
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-081-3/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-261-11/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-021-1/+2
| |\ \ \ \ \ \ \
| * | | | | | | | Fix certain type-const-ref syntax not recognized by normalizedSignature()Bradley T. Hughes2009-11-301-1/+1
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-124-10/+13
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | uic: Fixed code generating setCentralWidget()-calls of QMainWindow.Friedemann Kleint2010-02-041-2/+3
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-033-8/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-013-8/+8
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Add a warning when there are duplicate aliases in a resource file.Pierre Rossi2010-02-021-0/+2
| |/ / / / / /
* | | | | | | Make link bootstrap again.Thomas Zander2010-02-081-2/+2
* | | | | | | Fix linking for armlinkThomas Zander2010-02-041-3/+3
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-265-42/+42
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | uic3: Introduced option to preserve layout object names of Designer 3.Friedemann Kleint2010-01-215-42/+42
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2176-84/+100
|\ \ \ \ \ \ | |/ / / / /
| * | | | | doc: Explained parameter value defaults where appropriate.Martin Smith2010-01-081-5/+20
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0776-76/+76
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update copyright year to 2010Jason McDonald2010-01-0676-76/+76
| | | |_|/ | | |/| |
| * | | | uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroupDavid Faure2010-01-051-3/+4
| |/ / /
* | | | Fixed makefile generation for Symbian.axis2010-01-141-1/+1
|/ / /
* | | Fix moc generated code with dummy Q_PROPERTYOlivier Goffart2009-12-161-11/+0
| |/ |/|
* | Do not recoginze templated types or pointers as flags.Olivier Goffart2009-11-301-1/+2
|/
* Fix build on AIX: all of the .a file is linked into the program.Oswald Buddenhagen2009-11-241-7/+3
* 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
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-181-40/+0
|\ \ | |/
| * Revert "Added a standard copyright header to files generated by rcc."Olivier Goffart2009-11-161-40/+0
* | uic: Call to setCentralWidget() not generated for promoted central widgets.Friedemann Kleint2009-11-161-1/+1
* | fix shadow builds following bootstrap changesOswald Buddenhagen2009-11-121-0/+1