summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge earth-team into origin/master'Olivier Goffart2011-04-128-7/+29
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-085-4/+26
| |\
| | * Add support for -unset <prop> option to qmake.Darryl L. Miles2011-04-085-4/+26
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-073-3/+3
| |\ \ | | |/ | |/|
| | * win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-043-3/+3
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-072-4/+11
|\ \ \ | |/ /
| * | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-053-5/+5
| |\ \
| * | | Fix emulator deployment for items with "!:" drive.Miikka Heikkinen2011-03-161-1/+4
| * | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-1610-69/+59
| |\ \ \
| * | | | Removed broken "deploy.path" support from SymbianMiikka Heikkinen2011-03-151-3/+1
| * | | | Strip echo suppression character "@" from commands in symbian-sbsv2Miikka Heikkinen2011-03-101-0/+6
* | | | | Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-281-1/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | remove redundand validateModes() callOswald Buddenhagen2011-03-211-1/+0
| | * | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-145-29/+102
| | |\ \ \
| | | * | | Fixed win32-msvc2008 build regression.axis2011-03-042-9/+5
| | | * | | Made qmake strip trailing \ from libdirs.axis2011-03-041-1/+4
| | | * | | Added MinGW support for adding lib prefix and extension via profile.axis2011-03-043-9/+19
| | | * | | Added support for various special compiler/linker flags on MinGW.axis2011-03-041-0/+18
| | | * | | Added support for rvct_linker config in qmake's MinGW generator.axis2011-03-041-3/+11
| | | * | | Avoided some MinGW specific codepaths when building Symbian libs.axis2011-03-042-3/+4
| | | * | | Added .lib/.dso dependency tracking to Symbian with MinGW generator.axis2011-03-041-0/+6
| | | * | | Added object script support to RVCT when using MinGW qmake generator.axis2011-03-041-8/+38
| | | * | | Added Symbian makefile building support using MinGW backend.axis2011-03-042-3/+5
| | | * | | Added Symbian deployment localization for makefile build system.axis2011-03-041-2/+1
* | | | | | Merge remote branch 'earth-team/master-i18n' into 4.8-earthDenis Dzyubenko2011-03-244-2/+30
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'earth-team/master' into master-i18nDenis Dzyubenko2011-03-1711-98/+79
| |\ \ \ \ \ \
| * | | | | | | Split monolithic qlocale.cpp into platform-specific filesDenis Dzyubenko2011-02-244-2/+30
* | | | | | | | ReplaceExtraCompilerCacheKey: Don't recreate "::" QString on each call.Andreas Kling2011-03-231-2/+4
* | | | | | | | qmake vcxproj generator: fix non flat projects for VS2010Martin Petersson2011-03-221-17/+17
* | | | | | | | Merge remote-tracking branch 'origin/master'Olivier Goffart2011-03-2119-93/+619
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-182-4/+5
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | qmake vcproj generator: do not insert $(INHERIT)Joerg Bornemann2011-03-182-4/+5
| * | | | | | 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
| | |\ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \