summaryrefslogtreecommitdiffstats
path: root/qmake/generators/symbian/symmake.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-110/+53
|\
| * Improved support for OPTION and LINKEROPTION statements in MMP filesMiikka Heikkinen2010-04-121-110/+53
* | Cleanup the deployment codeThomas Zander2010-03-311-4/+3
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-0/+10
|\ \ | |/
| * Enable armcc version specific compler options for SymbianMiikka Heikkinen2010-03-261-0/+10
| * Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-12/+32
| * Changed Symbian pkg files to deploy from under epoc32Miikka Heikkinen2010-03-231-3/+18
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-171-793/+6
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-1/+1
| |\ \
| * | | Moved UID2 processing from cpp code to profiles.axis2010-03-151-17/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-1/+12
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-011-52/+34
| |\ \ \ \
| * | | | | Removed restrictions on file names from the Symbian makefile system.axis2010-02-261-2/+2
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-6/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-191-97/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-161-6/+39
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-121-13/+42
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Implemented rss file generator for Linux.axis2010-02-091-391/+0
| * | | | | | | | | Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-041-231/+3
* | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fix runonphone target due to changed name of sis filesShane Kearns2010-03-151-1/+1
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-11/+68
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Support for adding user specified list type content in rss fileMiikka Heikkinen2010-03-111-11/+68
* | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Added .condition modifier to SUBDIRS.Miikka Heikkinen2010-03-011-1/+12
* | | | | | | 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-261-47/+29
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Fix SymbianMakefileGenerator::absolutizePath for clean buildsMiikka Heikkinen2010-02-251-3/+7
| * | | | | Fix extensions section in bld.inf when CONFIG contains symbian_testMiikka Heikkinen2010-02-241-4/+11
| * | | | | Basic deployment support for ROM in SymbianMiikka Heikkinen2010-02-241-20/+0
| * | | | | Changed canonical paths to absolute paths in symmake.Miikka Heikkinen2010-02-221-22/+13
* | | | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-231-0/+3
* | | | | | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-211-9/+0
* | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-201-1/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-191-0/+3
| | * | | | Revert "Factored epocRoot implementation out of qmake"axis2010-02-191-3/+0
| | * | | | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-181-0/+3
| * | | | | 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-191-97/+0
|/ / / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-161-4/+61
|\ \ \ \ | |/ / /
| * | | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-4/+30
| | |/ | |/|
| * | 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-041-15/+57
|\ \ \ | |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-021-16/+17
| |\ \