summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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-2929-69/+70
| |\ \ | | |/ | |/|
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3029-60/+65
|\ \ \
| * \ \ 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-1629-58/+58
| |\ \ \ | | |/ /
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-1629-58/+58
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-254-12/+15
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-122-9/+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 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
| * | 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
| |\ \
| * \ \ Merge branch '4.5'Thiago Macieira2009-05-141-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-024-16/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-03-271-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Long live Qt!Lars Knoll2009-03-2329-0/+19549
| / / / / / / /
* | | | | | | | 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 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-038-8/+248
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'imSelections'axis2009-06-038-8/+248
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed incorrect headers.axis2009-06-038-8/+248
* | | | | | | | | | 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
| | |_|_|/ | |/| | |
* | | | | 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
|/ / / / /