summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-161-3/+8
|\
| * Merge earth-team into masterOlivier Goffart2011-03-151-3/+8
| |\
| | * QMAKE: Fix post build events for VS2010Martin Petersson2011-03-151-3/+8
* | | Revert "qmake vcproj generator: do not insert $(INHERIT)"Joerg Bornemann2011-03-152-7/+6
* | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-152-6/+7
* | | qmake/Mac: replace @SHORT_VERSION@ in QMAKE_INFO_PLIST file not only for libsJoerg Bornemann2011-03-152-5/+15
* | | qmake nmake / mingw32-make generators: fix DEF_FILE for shadow buildsJoerg Bornemann2011-03-152-4/+8
* | | qmake: fix the language settings generated Windows resource filesJoerg Bornemann2011-03-151-0/+4
* | | qmake vc(x)proj generator: fix handling of DEFINES from .prl filesJoerg Bornemann2011-03-152-14/+0
* | | qmake vc(x)proj generator: set the output directoryJoerg Bornemann2011-03-151-37/+8
* | | qmake vc(x)proj generator: fix reading of /YX, /Yc, /Yu compiler flagsJoerg Bornemann2011-03-151-3/+3
* | | qmake vcproj generator: support PCHs with other extensions than .hJoerg Bornemann2011-03-152-2/+9
|/ /
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+4
|\ \
| * | Adding quote around files in QMAKE_CLEAN to tackle wildcard issueGuoqing Zhang2011-03-091-1/+4
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-031-2/+2
|\ \ \ | |/ /
| * | fix DLLDESTDIR handling in nmake generator when QMAKE_POST_LINK is usedOswald Buddenhagen2011-03-021-2/+2
* | | don't add extraneous empty command linesOswald Buddenhagen2011-03-011-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-289-20/+560
|\ \ \ | |_|/ |/| |
| * | Ammend last INTEGRITY fixHarald Fernengel2011-02-243-3/+14
| * | Fix qmake build on WindowsHarald Fernengel2011-02-243-3/+3
| * | Fix license headersHarald Fernengel2011-02-222-46/+56
| * | Add support for the INTEGRITY RTOS build systemRolland Dudemaine2011-02-226-14/+533
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-0/+12
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-211-0/+12
| |\
| | * Added support for QMAKE_CLEAN in symbian-sbsv2Miikka Heikkinen2011-02-211-0/+12
* | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-166-30/+105
|\ \ \
| * | | Add experimental support for armCC on LinuxHarald Fernengel2011-02-111-1/+3
| * | | Fixed win32-msvc2008 build regression.axis2011-01-312-9/+5
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3153-300/+331
| |\ \ \
| * \ \ \ Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-285-27/+105
| |\ \ \ \
| | * | | | Made qmake strip trailing \ from libdirs.axis2011-01-281-1/+4
| | * | | | Added MinGW support for adding lib prefix and extension via profile.axis2011-01-283-9/+19
| | * | | | Added support for various special compiler/linker flags on MinGW.axis2011-01-281-0/+18
| | * | | | Added support for rvct_linker config in qmake's MinGW generator.axis2011-01-281-3/+11
| | * | | | Avoided some MinGW specific codepaths when building Symbian libs.axis2011-01-282-3/+4
| | * | | | Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-01-281-0/+6
| | * | | | Added object script support to RVCT when using MinGW qmake generator.axis2011-01-281-8/+38
| | * | | | Added Symbian makefile building support using MinGW backend.axis2011-01-282-3/+5
| * | | | | Added Symbian deployment localization for makefile build system.axis2011-01-271-2/+1
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-5/+16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | complain about unmatched quotes/parensOswald Buddenhagen2011-02-031-1/+12
| * | | | | use const refOswald Buddenhagen2011-02-031-1/+1
| * | | | | move multiple inclusion check for feature files to correct locationOswald Buddenhagen2011-02-031-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-014-24/+33
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Fix generated mif file cleaning in symbian-abldMiikka Heikkinen2011-01-281-1/+3
| * | | No longer replace dash and dot in TARGET with underscore in SymbianMiikka Heikkinen2011-01-273-24/+31
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-261-1/+1
|\ \ \ \ | |/ / /
| * | | Fix QMAKE_POST_LINK in Symbian for targets with special characters.Miikka Heikkinen2011-01-251-1/+1
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-263-25/+42
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-253-25/+42
| |\ \ \ \ | | |/ / /