Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed installer_sis target for 4.7 | Miikka Heikkinen | 2010-04-14 | 1 | -4/+24 |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-12 | 2 | -110/+62 |
|\ | |||||
| * | Improved support for OPTION and LINKEROPTION statements in MMP files | Miikka Heikkinen | 2010-04-12 | 2 | -110/+62 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-01 | 5 | -10/+8 |
|\ \ | |||||
| * | | Cleanup the deployment code | Thomas Zander | 2010-03-31 | 5 | -10/+8 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Compile on Maemo 5 | Harald Fernengel | 2010-03-26 | 1 | -2/+3 |
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-29 | 2 | -12/+43 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Enable armcc version specific compler options for Symbian | Miikka Heikkinen | 2010-03-26 | 1 | -0/+10 |
| * | Made it possible to define more than one language using pkg_prerules | Miikka Heikkinen | 2010-03-24 | 1 | -12/+32 |
| * | Changed Symbian pkg files to deploy from under epoc32 | Miikka Heikkinen | 2010-03-23 | 1 | -3/+18 |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60 | axis | 2010-03-18 | 2 | -0/+4 |
|\ \ | |/ | |||||
| * | Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles. | Rohan McGovern | 2010-03-18 | 2 | -0/+4 |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 9 | -834/+1093 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-03-16 | 5 | -15/+80 |
| |\ \ | |||||
| * | | | Moved UID2 processing from cpp code to profiles. | axis | 2010-03-15 | 1 | -17/+1 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 4 | -3/+15 |
| |\ \ \ | |||||
| * | | | | Fix src!=build issue | Thomas Zander | 2010-03-04 | 1 | -1/+2 |
| * | | | | Corrected a mismerge by Git. | axis | 2010-03-01 | 1 | -1/+1 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-01 | 8 | -103/+142 |
| |\ \ \ \ | |||||
| * | | | | | Removed restrictions on file names from the Symbian makefile system. | axis | 2010-02-26 | 4 | -9/+19 |
| * | | | | | Fixed a bug where the library extension would be embedded in pkg name | axis | 2010-02-25 | 1 | -4/+12 |
| * | | | | | Added missing header after merge with master. | axis | 2010-02-23 | 1 | -0/+3 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-23 | 6 | -152/+12 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed copy/paste error after commit a31e40295d. | axis | 2010-02-23 | 1 | -1/+1 |
| * | | | | | | Prevented pkg generation unless there are files to deploy. | axis | 2010-02-22 | 1 | -1/+17 |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-19 | 5 | -134/+0 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-18 | 1 | -12/+5 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 2 | -18/+75 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | axis | 2010-02-12 | 5 | -36/+157 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Made some changes after code review. | axis | 2010-02-12 | 1 | -1/+1 |
| * | | | | | | | | | | More src!=builddir fixes for symbian makefile generator | Thomas Zander | 2010-02-11 | 1 | -3/+10 |
| * | | | | | | | | | | Place the generated pkg file in the build dir. | Thomas Zander | 2010-02-10 | 1 | -3/+3 |
| * | | | | | | | | | | Implemented rss file generator for Linux. | axis | 2010-02-09 | 6 | -433/+499 |
| * | | | | | | | | | | Implemented pkg generator for the symbian/linux-armcc mkspec. | axis | 2010-02-04 | 9 | -257/+447 |
| * | | | | | | | | | | Fixed path separators in the plugin stub generator. | axis | 2010-02-01 | 1 | -2/+2 |
* | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix runonphone target due to changed name of sis files | Shane Kearns | 2010-03-15 | 1 | -1/+1 |
* | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-15 | 2 | -14/+79 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Support for adding user specified list type content in rss file | Miikka Heikkinen | 2010-03-11 | 2 | -14/+79 |
* | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Rohan McGovern | 2010-03-06 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Added .condition modifier to SUBDIRS. | Miikka Heikkinen | 2010-03-01 | 1 | -1/+12 |
* | | | | | | | | | don't have every generator duplicate the QMAKE_QMAKE logic | Oswald Buddenhagen | 2010-03-03 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | give symbian an own platform mode | Oswald Buddenhagen | 2010-02-26 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch '4.6' | Miikka Heikkinen | 2010-02-26 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES | Miikka Heikkinen | 2010-02-26 | 1 | -5/+5 |
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 8 | -116/+178 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix SymbianMakefileGenerator::absolutizePath for clean builds | Miikka Heikkinen | 2010-02-25 | 1 | -3/+7 |
| * | | | | | | Misc fixes to FLM files | Miikka Heikkinen | 2010-02-25 | 1 | -1/+1 |