summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-041-1/+4
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-248-14/+141
| |\
| * | Fix Q_INVOKABLE declared after Q_PROPERTYOlivier Goffart2011-02-241-1/+4
* | | Add a "-nn" option to mocRolland Dudemaine2011-02-223-4/+16
| |/ |/|
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-048-14/+141
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1976-76/+76
| |\
| * | Allow a revision to be associated with properties and methods.Martin Jones2011-01-058-14/+141
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1776-76/+76
|\ \ \ | | |/ | |/|
| * | Update copyright year to 2011.Jason McDonald2011-01-1076-76/+76
| |/
* | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-233-0/+23
|\ \
| * | Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-223-0/+23
* | | Use QSystemError to return errors from QFileSystemEngineShane Kearns2010-10-121-1/+2
* | | Merge commit 'origin/master' into fileEnginesOn47Thomas Zander2010-09-2814-92/+207
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-107-22/+54
| |\ \ | | |/
| | * 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
| * | | Designer/uic: Start on support for QIcon::fromTheme().Friedemann Kleint2010-09-084-21/+89
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-08-262-2/+6
| |\ \ \
| | * | | Compile bootstrapped tools with QT_NO_DEPRECATEDHarald Fernengel2010-08-252-2/+6
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-253-48/+59
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | moc: Error if the NOTIFY signal is invalid.Olivier Goffart2010-08-193-48/+59
* | | | Implement QFileSystemIterator for windows.Prasanth Ullattil2010-09-151-1/+0
* | | | Refactored QFSFileEngineIterator/UnixJoão Abecasis2010-09-101-2/+1
* | | | QFileSystemEngine/Mac: keep it empty until neededJoão Abecasis2010-09-031-0/+1
* | | | Adding minimal QFileSystemIterator APIJoão Abecasis2010-08-311-0/+2
* | | | Move canonicalPath() to the new qfilesystemengine_unixThomas Zander2010-08-301-0/+1
* | | | Adding QFileSystemEntry and QFileSystemEngine to build systemJoão Abecasis2010-08-301-2/+5
|/ / /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-1/+1
|\ \ \ | |/ /
| * | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-1/+1
* | | Remove the use of deprecated qVariant*Olivier Goffart2010-08-063-9/+9
|/ /
* | 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
|\ \ \ | | |/ | |/|