summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-1/+16
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-011-0/+4
| |\
| | * Readd a line that got removed by accident in previous changeAndy Shaw2010-03-011-0/+1
| | * Ensure that a library path with a space in it gets quoted on WindowsAndy Shaw2010-03-011-1/+4
| * | Added .condition modifier to SUBDIRS.Miikka Heikkinen2010-03-011-1/+12
| |/
* | don't have every generator duplicate the QMAKE_QMAKE logicOswald Buddenhagen2010-03-0310-25/+12
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-268-14/+84
|\ \
| * | Get qmake to add pdb files to install target in debug configuration.Sean Harmer2010-02-262-0/+18
| * | give symbian an own platform modeOswald Buddenhagen2010-02-263-1/+3
| * | decouple host platform mode from target platform modeOswald Buddenhagen2010-02-264-7/+48
| * | simplify string opsOswald Buddenhagen2010-02-261-1/+1
| * | add possibility to request project recursion from within a pro fileOswald Buddenhagen2010-02-262-6/+15
* | | Merge branch '4.6'Miikka Heikkinen2010-02-261-5/+5
|\ \ \ | | |/ | |/|
| * | Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULESMiikka Heikkinen2010-02-261-5/+5
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-268-116/+178
|\ \ \ | |/ / | | / | |/ |/|
| * Fix SymbianMakefileGenerator::absolutizePath for clean buildsMiikka Heikkinen2010-02-251-3/+7
| * Misc fixes to FLM filesMiikka Heikkinen2010-02-251-1/+1
| * Fix extensions section in bld.inf when CONFIG contains symbian_testMiikka Heikkinen2010-02-244-7/+14
| * Basic deployment support for ROM in SymbianMiikka Heikkinen2010-02-247-84/+144
| * Changed canonical paths to absolute paths in symmake.Miikka Heikkinen2010-02-222-23/+14
* | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-236-146/+12
* | Factored readRegistryKey implementation out of qmakeaxis2010-02-231-96/+1
* | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-211-1/+96
* | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-216-18/+146
* | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-207-243/+14
|\ \
| * \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-207-242/+13
| |\ \ | | |/
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-196-146/+12
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-191-96/+1
| | * Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-191-1/+96
| | * Revert "Factored epocRoot implementation out of qmake"axis2010-02-196-12/+146
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-186-146/+12
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-181-96/+1
| * | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+1
| |\ \ | | |/
| | * Use correct (forward slash) separators in qmake-generated bld.infIain2010-02-171-1/+1
* | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-195-134/+0
|/ /
* | Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-167-1375/+12
|\ \
| * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-137-1375/+12
| |\ \
| | * | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-121-5/+1
| | * | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | * | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-121-14/+2
| | * | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-123-1337/+0
| | * | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | * | remove remainder of mac9 modeOswald Buddenhagen2010-02-122-7/+3
| | * | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-122-4/+1
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-4/+30
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-122-3/+34
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-162-5/+62
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-4/+30
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-091-1/+1
| |\
| | * Make generate uid3 (symbian) work on 64 bit host platform.Thomas Zander2010-02-081-1/+1