summaryrefslogtreecommitdiffstats
path: root/qmake/generators/metamakefile.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Review fixes to qmakeMiikka Heikkinen2009-08-181-2/+1
* | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-061-2/+2
|\ \ \
| * \ \ Merge commit 'origin/master'Jason Barron2009-08-041-61/+25
| |\ \ \
| * \ \ \ Merge commit 'qt/master-stable'Jason Barron2009-07-271-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | some directory separator cleanupOswald Buddenhagen2009-07-171-2/+2
| | | |/ | | |/|
* | | | Code style fixes to qmakeMiikka Heikkinen2009-08-061-39/+38
* | | | Further cleanup of qmake codesMiikka Heikkinen2009-08-061-5/+5
| |_|/ |/| |
* | | Whitespace, comment, and dead code cleanup for qmakeMiikka Heikkinen2009-08-041-61/+25
|/ /
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-4/+9
|\ \ | |/
| * Do not crash qmake if MAKEFILE_GENERATOR is not defined in a loaded .pr* fileKeith Isdale2009-06-241-2/+7
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-8/+5
|\ \ | |/
| * do not make PWD and OUT_PWD have trailing slashes upon returning from a SUBDI...Oswald Buddenhagen2009-06-111-6/+5
| * do not append trailing slash to OUT_PWD in nested pro-filesOswald Buddenhagen2009-06-111-2/+0
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-1/+1
|\ \ | |/
| * Spring cleaning in qmake testsJoão Abecasis2009-04-021-1/+1
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+490
* Long live Qt for S60!axis2009-04-241-0/+801