summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/master'Jason Barron2009-08-0416-285/+259
|\
| * Whitespace, comment, and dead code cleanup for qmakeMiikka Heikkinen2009-08-0416-252/+176
| * Removed unused method from SymbianMakefileGenerator.Janne Anttila2009-07-292-14/+0
| * Fixed some tab/space usage in symmake.cppJanne Anttila2009-07-291-20/+20
| * Extended PKG customization possibilities via qmake.Janne Anttila2009-07-292-22/+85
| * Changed .pkg files to follow the naming scheme of make targets.Janne Anttila2009-07-281-2/+3
* | Merge commit 'qt/master-stable'Jason Barron2009-08-045-22/+12
|\ \
| * | Port of Qt to QNXHarald Fernengel2009-07-295-22/+12
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-292-8/+7
|\ \ \ | |/ /
| * | Fix qmake.pro so it can build qmake.Jason Barron2009-07-271-0/+1
| * | Fix qmake dependency generation for include statements with local files.Simon Hausmann2009-07-271-8/+6
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-2710-91/+88
|\ \ \ | |/ / | | / | |/ |/|
| * micro-optimization of some string operationsOswald Buddenhagen2009-07-171-18/+18
| * some directory separator cleanupOswald Buddenhagen2009-07-172-15/+21
| * Compile fix on windows.Denis Dzyubenko2009-07-163-6/+6
| * Changed the implementation of the unicode text codecs to share more code with...Denis Dzyubenko2009-07-165-1/+29
| * fix bug in qmake DEPLOYMENT variableJoerg Bornemann2009-07-131-2/+1
| * qmake: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportMarius Storm-Olsen2009-07-013-49/+13
* | Made deployment paths with drive letters work.axis2009-07-131-1/+5
* | 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
| |\ \ \ \ \ \ \