summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Fix ICON keyword to work with absolute paths also in SBSv2.Janne Anttila2009-11-201-1/+4
| * Changed MIF filename from UID to target name in Symbian.Janne Anttila2009-11-186-17/+22
| * Remove temp dirs workaround for raptor builds onlyShane Kearns2009-11-096-34/+34
* | Merge branch '4.6'Thiago Macieira2009-11-101-2/+42
|\ \ | |/
| * Initial LFLAGS support for qmake on Symbian OSIain2009-11-051-2/+42
* | Merge branch '4.6'Thiago Macieira2009-10-213-7/+18
|\ \ | |/
| * Revert "Switch from *-armv5 to *-armv6."Frans Englich2009-10-212-6/+6
| * Switch from *-armv5 to *-armv6.Frans Englich2009-10-212-6/+6
| * Ensure qmake does not lose the error code when going over the subdirsAndy Shaw2009-10-203-7/+18
* | Merge branch '4.6'Thiago Macieira2009-10-163-346/+69
|\ \ | |/
| * Refactored SymbianSubdirsMetaMakefileGenerator out of qmake.Miikka Heikkinen2009-10-163-346/+69
* | Prevent cross-talk between different Qt builds on OS X.Morten Sorvig2009-10-121-1/+0
* | Patched qmake to try to resolve a directory argument in makefile mode.J-P Nurmi2009-10-061-11/+25
|/
* Enable overriding TARGETTYPE and OPTION statements with MMP_RULESMiikka Heikkinen2009-10-022-19/+58
* Revert "qmake - add error message if files for deployment are missing"Joerg Bornemann2009-10-011-8/+2
* Support for generating OPTION GCCE from QMAKE_CXXFLAGS.GCCEShane Kearns2009-09-221-3/+21
* Fix qmake pkg file generator to respect a drive specified for binariesShane Kearns2009-09-221-2/+7
* Update license headers again.Jason McDonald2009-09-0949-196/+196
* Renamed make 'sisx' target to 'sis' and QT_SISX_* variables to QT_SIS_*Janne Anttila2009-09-034-25/+25
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-319-117/+117
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3140-520/+520
|\
| * Update tech preview license header.Jason McDonald2009-08-3140-520/+520
| * Update license headers.Jason McDonald2009-08-1140-40/+40
* | Merge branch 'master' into 4.6Janne Anttila2009-08-311-1/+1
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Anttila2009-08-281-1/+1
| |\ \
| * | | Updated docs to reflect current 'createpackage' and 'make sisx' syntax.Janne Anttila2009-08-281-1/+1
* | | | Merge branch 'master' into 4.6Janne Anttila2009-08-286-62/+133
|\ \ \ \ | | |/ / | |/| |