summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-17/+69
|\
| * 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 '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-049-41/+87
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-031-1/+1
| |\
| | * Fixed QFileInfo::absolutePath() warning when running "qmake -project"Andreas Kling2010-02-031-1/+1
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-028-41/+46
| |\ \ | | |/ | |/|
| | * qmake: subdirs template: make distclean target use QMAKE_DISTCLEANOswald Buddenhagen2010-02-011-0/+1
| | * qmake: fix warningsOswald Buddenhagen2010-02-016-24/+27
| | * 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-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-215-10/+44
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-201-1/+13
| |\ \ \
| | * | | Add command to qmake to do symbian-uid generationThomas Zander2010-01-201-1/+13
| * | | | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-204-9/+31
| |/ / /
* | | | Merge branch '4.6'Thiago Macieira2010-01-181-8/+6
|\ \ \ \ | |/ / /
| * | | 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'Thiago Macieira2010-01-1349-49/+49
|\ \ \ \ | |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0949-49/+49
| |\ \ \
| | * \ \ 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-0649-49/+49
* | | | | | Merge branch '4.6'Thiago Macieira2010-01-121-6/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-071-6/+1
| | |/ / / | |/| | |
* | | | | Merge branch '4.6'Thiago Macieira2010-01-081-8/+5
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | 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
| |/ /
* | | Merge branch '4.6'Thiago Macieira2009-12-266-26/+97
|\ \ \ | |/ /
| * | 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
| |\ \ \ | | |/ /
| * | | Fixed "make run" target for targets with special characters in them.Miikka Heikkinen2009-12-102-13/+13
* | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-152-50/+111
|\ \ \ \ | | |/ / | |/| |
| * | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-092-50/+111
| |\ \ \ | | |/ /
| | * | MMP_RULES overriding qmake variables now warns userMiikka Heikkinen2009-12-042-50/+111
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-1/+1
|\ \ \ \ | |/ / /
| * | | Apparently fixes some build issues on some old unixes...Pierre Rossi2009-12-041-1/+1
| |/ /
* | | Merge branch '4.6'Thiago Macieira2009-11-256-52/+60
|\ \ \ | |/ /