summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-155-24/+60
|\
| * Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-17/+69
| |\
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-041-0/+13
| |\ \
| | * | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-046-36/+81
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas...Pulse Build System2010-01-224-23/+59
| |\ \ \
| | * \ \ Merge branch 'merge-request-1601' into master-s60axis2010-01-054-23/+59
| | |\ \ \
| | | * | | Improving parts of commit 2d8d855d.axis2009-11-171-10/+20
| | | * | | qmake: add Linux host support to Symbian generatorAnderson Lizardo2009-11-174-23/+53
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-214-9/+31
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-181-8/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1338-38/+38
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-121-6/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-081-8/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-266-26/+97
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-152-50/+111
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-11-256-52/+60
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-11-101-2/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-212-6/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-10-162-323/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Prevent cross-talk between different Qt builds on OS X.Morten Sorvig2009-10-121-1/+0
* | | | | | | | | | | | | | | | | 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 branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-051-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | 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 branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-026-37/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | qmake: subdirs template: make distclean target use QMAKE_DISTCLEANOswald Buddenhagen2010-02-011-0/+1
| * | | | | | | | | | | | | | | qmake: fix warningsOswald Buddenhagen2010-02-014-20/+22
| * | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-204-9/+31
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
* | | | | | | | | | | | | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0938-38/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | 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-0638-38/+38
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | 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
* | | | | | | | | | Deal with test cases that crash or hangShane Kearns2010-01-041-1/+1
|/ / / / / / / / /
* | | | | | | | | Changed make sis only require .make.cache if QT_SIS_TARGET is not set.Miikka Heikkinen2009-12-221-2/+4
* | | | | | | | | Added more specific clean targets for Symbian buildsMiikka Heikkinen2009-12-222-3/+57
* | | | | | | | | Tool for launching symbian apps on the phone from windows command lineShane Kearns2009-12-214-10/+22
* | | | | | | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-172-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj filesAndy Shaw2009-12-162-2/+5
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-111-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /