summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-094-113/+108
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-07-011-1/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'warningRemovals'axis2009-06-301-1/+3
| | |\ \ \ \ \
| | | * | | | | Removed warnings on Symbian.axis2009-06-301-1/+3
| * | | | | | | Added temporary include file generation to symbian-sbsv2 generatorMiikka Heikkinen2009-07-014-112/+105
| |/ / / / / /
| * | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2940-99/+98
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
* | | | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3040-82/+93
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch '4.5'Thiago Macieira2009-06-241-2/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Do not crash qmake if MAKEFILE_GENERATOR is not defined in a loaded .pr* fileKeith Isdale2009-06-241-2/+7
| * | | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1640-80/+86
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-1640-80/+80
| | * | disable stdout buffering alltogetherOswald Buddenhagen2009-06-161-6/+3
| | * | Fixes crash of qmake on Windows Vista Business x64 (and undefinedRohan McGovern2009-06-161-0/+2
| | * | Force line buffering for stdout so it stays in sync better with stderr (which...audiofanatic2009-06-151-0/+7
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-256-22/+16
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-123-17/+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
| | * remove strange no-opOswald Buddenhagen2009-06-111-1/+0
| | * remove dead codeOswald Buddenhagen2009-06-111-8/+0
| * | Remove var->QMAKE_COMP_var docs, and mark feature unsupported.Marius Storm-Olsen2009-06-111-0/+1
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-1/+1
| |\ \ | | |/
| * | Made qmake handle "no_default" config for sub targetsJ-P Nurmi2009-06-051-1/+6
| * | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-1/+1
| |\ \
| * \ \ Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-1/+1
| |\ \ \
| * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-1/+1
| |\ \ \ \
| * | | | | less inefficientOswald Buddenhagen2009-05-181-1/+1
| * | | | | Merge branch '4.5'Thiago Macieira2009-05-141-1/+1
| |\ \ \ \ \
| * | | | | | Remove unused file qfileinfo_p.hMarius Storm-Olsen2009-05-131-1/+0
| * | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.5'Rhys Weatherley2009-04-211-3/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-072-3/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-025-17/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-03-271-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Long live Qt!Lars Knoll2009-03-2347-0/+27151
| / / / / / / / / / /
* | | | | | | | | | | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-111-2/+10
* | | | | | | | | | | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-113-46/+70
* | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | link qmake without /DEBUG on WindowsJoerg Bornemann2009-06-051-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Allow qmake to compile using it's .pro file.Jason Barron2009-06-031-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Make qmake compile from .pro on other platforms.Jason Barron2009-06-031-1/+6
* | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-0310-10/+310
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'imSelections'axis2009-06-0310-10/+310
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed incorrect headers.axis2009-06-0310-10/+310
* | | | | | | | | | | Removed DEPENDS keyword from resource blocks of generated mmp files from symb...Miikka Heikkinen2009-06-031-2/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-022-2/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-022-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | Remove the fixFilename() usage from the solution generatorMarius Storm-Olsen2009-05-291-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Fixed qmake writing targets into the root of the current drive whenRohan McGovern2009-05-261-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Removed unused function from symmakeMiikka Heikkinen2009-06-022-4/+0
|/ / / / / / /