| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'qt/master' into s60-master | Qt Continuous Integration System | 2010-02-16 | 16 | -1420/+23 |
|\ |
|
| * | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 16 | -1420/+23 |
| |\ |
|
| | * | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs | Oswald Buddenhagen | 2010-02-12 | 1 | -5/+1 |
|
|
| | * | use variables from the spec instead of hard-coding platform ifdefs | Oswald Buddenhagen | 2010-02-12 | 1 | -7/+4 |
|
|
| | * | move $(DEL_FILE) 2> NUL redirection into .conf file | Oswald Buddenhagen | 2010-02-12 | 1 | -14/+2 |
|
|
| | * | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now. | Oswald Buddenhagen | 2010-02-12 | 8 | -1356/+6 |
|
|
| | * | remove weird -tp ce matching line nobody can say anything about | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 |
|
|
| | * | remove remainder of mac9 mode | Oswald Buddenhagen | 2010-02-12 | 5 | -24/+6 |
|
|
| | * | remove the most blatant tmake compat paths | Oswald Buddenhagen | 2010-02-12 | 3 | -12/+2 |
|
|
| | * | simplify | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 |
|
|
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 1 | -4/+30 |
| |\ \ |
|
| * \ \ | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 3 | -7/+44 |
| |\ \ \
| | |_|/
| |/| | |
|
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-16 | 3 | -9/+72 |
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| * | | Add make stub_sis target, and add webkit stub to qt.iby | Shane Kearns | 2010-02-12 | 1 | -4/+30 |
| |/ |
|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-02-09 | 1 | -1/+1 |
| |\ |
|
| | * | Make generate uid3 (symbian) work on 64 bit host platform. | Thomas Zander | 2010-02-08 | 1 | -1/+1 |
|
|
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-09 | 1 | -2/+33 |
| |\ \ |
|
| | * | | Streamlined smart installer package creation in Symbian | Miikka Heikkinen | 2010-02-09 | 1 | -2/+33 |
| | |/ |
|
| * | | Added QMake directory to INCPATH so the compiler can find required headers | Constantin Makshin | 2010-02-08 | 1 | -4/+10 |
| |/ |
|
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 1 | -17/+69 |
|\ \
| |/ |
|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-05 | 1 | -0/+13 |
| |\ |
|
| | * | Add the QMAKE_FILE_EXT variable to extra compilers generation. | Jocelyn Turcotte | 2010-02-04 | 1 | -0/+13 |
|
|
| * | | Fixed the location where bootstrap.sis is looked for. | Miikka Heikkinen | 2010-02-04 | 1 | -1/+1 |
|
|
| * | | Added support for smart installer package generation in Symbian | Miikka Heikkinen | 2010-02-04 | 1 | -17/+69 |
| |/ |
|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-04 | 1 | -0/+13 |
|\ \ |
|
| * | | Add the QMAKE_FILE_EXT variable to extra compilers generation. | Jocelyn Turcotte | 2010-02-04 | 1 | -0/+13 |
|
|
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Olivier Goffart | 2010-02-04 | 9 | -41/+87 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-03 | 1 | -1/+1 |
| |\ |
|
| | * | Fixed QFileInfo::absolutePath() warning when running "qmake -project" | Andreas Kling | 2010-02-03 | 1 | -1/+1 |
|
|
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int... | Qt Continuous Integration System | 2010-02-02 | 8 | -41/+46 |
| |\ \
| | |/
| |/| |
|
| | * | qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN | Oswald Buddenhagen | 2010-02-01 | 1 | -0/+1 |
|
|
| | * | qmake: fix warnings | Oswald Buddenhagen | 2010-02-01 | 6 | -24/+27 |
|
|
| | * | qmake: Remove macro and simplify string expression previously using it | Oswald Buddenhagen | 2010-02-01 | 1 | -2/+3 |
|
|
| | * | qmake: use isActiveConfig() instead of hand-crafting comparisons | Oswald Buddenhagen | 2010-02-01 | 3 | -15/+15 |
|
|
| * | | Added support for ifdeffing for manufacturer in generated pkg files | Miikka Heikkinen | 2010-01-28 | 1 | -0/+40 |
| |/ |
|
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas... | Pulse Build System | 2010-01-22 | 4 | -23/+59 |
|\ \ |
|
| * \ | Merge branch 'merge-request-1601' into master-s60 | axis | 2010-01-05 | 4 | -23/+59 |
| |\ \ |
|
| | * | | Improving parts of commit 2d8d855d. | axis | 2009-11-17 | 1 | -10/+20 |
|
|
| | * | | qmake: add Linux host support to Symbian generator | Anderson Lizardo | 2009-11-17 | 4 | -23/+53 |
|
|
* | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-21 | 5 | -10/+44 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-01-20 | 1 | -1/+13 |
| |\ \ \ |
|
| | * | | | Add command to qmake to do symbian-uid generation | Thomas Zander | 2010-01-20 | 1 | -1/+13 |
|
|
| * | | | | Generic solution for plugin stub exports for IBY usage | Miikka Heikkinen | 2010-01-20 | 4 | -9/+31 |
| |/ / / |
|
* | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-18 | 1 | -8/+6 |
|\ \ \ \
| |/ / / |
|
| * | | | Better fix for build!=src Makefile generation | Thomas Zander | 2010-01-14 | 1 | -5/+3 |
|
|
| * | | | Fix rules for recreating the Makefile in a subdir | Thomas Zander | 2010-01-13 | 1 | -8/+8 |
|
|
* | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 49 | -49/+49 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-09 | 49 | -49/+49 |
| |\ \ \ |
|
| | * \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Jason McDonald | 2010-01-06 | 1 | -8/+5 |
| | |\ \ \ |
|
| | * | | | | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 49 | -49/+49 |
|
|