summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1976-76/+76
|\
| * Update copyright year to 2011.Jason McDonald2011-01-1076-76/+76
* | Allow a revision to be associated with properties and methods.Martin Jones2011-01-058-14/+141
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-086-21/+52
|\
| * 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-076-19/+48
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-1/+2
|\ \ | |/ |/|
| * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-031-1/+2
* | moc: Error if the NOTIFY signal is invalid.Olivier Goffart2010-08-193-48/+59
* | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-1/+1
* | moc: Slot with complex template default value does not compileOlivier Goffart2010-07-191-1/+21
* | Consolidate zlib configuration redundancyMark Brand2010-07-021-19/+2
* | 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