summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\
| | * 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-3/+8
|\ \ \ | |/ /
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+0
| |\ \ | | |/
| | * remove strange no-opOswald Buddenhagen2009-06-111-1/+0
| * | Remove var->QMAKE_COMP_var docs, and mark feature unsupported.Marius Storm-Olsen2009-06-111-0/+1
| * | Made qmake handle "no_default" config for sub targetsJ-P Nurmi2009-06-051-1/+6
| |/
* | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-111-44/+57
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-11/+5
|\ \ | |/
| * fix QMAKE_VAR_FIRST_ expansion in compiler flagsOswald Buddenhagen2009-04-071-1/+1
| * Small changes in qmake's fileFixifyJoão Abecasis2009-04-021-9/+3
| * even more verbose debug outputOswald Buddenhagen2009-03-271-1/+1
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+3023
* Long live Qt for S60!axis2009-04-241-0/+3085