summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * 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-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
| * 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
* | 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
|/ /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-181-1/+1
|\ \ | |/
| * Use isNull() for strings instead of comparing against QString().Jesper Thomschütz2009-05-141-1/+1
* | Improved Linux compatibility for Symbian builds.Miikka Heikkinen2009-05-151-2/+7
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-061-1/+1
|\ \
| * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-061-1/+1
| |\ \ | | |/
| | * Changed include file name to lowercase to be able to crosscompile win32-g++ v...Denis Dzyubenko2009-04-281-1/+1
* | | Added VERSION keyword generation to mmp filesMiikka Heikkinen2009-05-062-0/+42
|/ /
* | Fixed symbian-sbsv2 ICON keyword so that it will generate iconsMiikka Heikkinen2009-04-301-0/+1
* | Changed generated file headers to have timestamp in ISO format insteadMiikka Heikkinen2009-04-282-8/+8
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-281-1/+1
|\ \
| * | Removed preserving read-only flag from winscw deployed files to makeMiikka Heikkinen2009-04-281-1/+1
* | | Re-enabled winscw target for non-OS_WIN builds.Miikka Heikkinen2009-04-281-6/+4
|/ /
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-2710-27/+32
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-04-271-1/+1
| |\ \
| * | | Fixed compilation of qmake on MSVC6.axis2009-04-273-3/+3
| * | | Fixed a few typos in qmake makefile for win32.axis2009-04-271-1/+2
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-277-24/+28
| |\ \ \ | | | |/ | | |/|
| | * | Missing debug .rc file with a clean shadow buildLincoln Ramsay2009-04-211-3/+15
| | * | qmake: additional compiler options were written twice into vcproj filesJoerg Bornemann2009-04-071-2/+0
| | * | 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