summaryrefslogtreecommitdiffstats
path: root/qmake/generators/symbian
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-261-0/+1
|\
| * give symbian an own platform modeOswald Buddenhagen2010-02-261-0/+1
* | 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
* | 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-206-147/+13
|\ \
| * \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-206-146/+12
| |\ \ | | |/
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-196-146/+12
| | * Revert "Factored epocRoot implementation out of qmake"axis2010-02-196-12/+146
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-186-146/+12
| * | 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-161-12/+5
|\ \
| * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-131-12/+5
| |\ \
| | * | 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
| * | | 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
| * | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-091-2/+33
| |/
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-17/+69
|\ \ | |/
| * Fixed the location where bootstrap.sis is looked for.Miikka Heikkinen2010-02-041-1/+1
| * Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-041-17/+69
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-043-17/+59
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-023-18/+19
| |\
| | * qmake: fix warningsOswald Buddenhagen2010-02-011-1/+1
| | * qmake: Remove macro and simplify string expression previously using itOswald Buddenhagen2010-02-011-2/+3
| | * qmake: use isActiveConfig() instead of hand-crafting comparisonsOswald Buddenhagen2010-02-013-15/+15
| * | Added support for ifdeffing for manufacturer in generated pkg filesMiikka Heikkinen2010-01-281-0/+40
| |/
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas...Pulse Build System2010-01-223-21/+51
|\ \ | |/ |/|
| * Merge branch 'merge-request-1601' into master-s60axis2010-01-053-21/+51
| |\
| | * Improving parts of commit 2d8d855d.axis2009-11-171-10/+20
| | * qmake: add Linux host support to Symbian generatorAnderson Lizardo2009-11-173-21/+45
* | | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-204-9/+31
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-099-9/+9
|\ \ \
| * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-061-8/+5
| |\ \ \
| * | | | Update copyright year to 2010Jason McDonald2010-01-069-9/+9
| | |/ / | |/| |
* | | | Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-071-6/+1
| |/ / |/| |
* | | Minor logic fix to Symbian generator in qmakeMiikka Heikkinen2010-01-051-7/+4