summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-171-1/+1
|\
| * Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-168-51/+41
| |\
| * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-061-1/+1
| |\ \
| | * | don't ignore create_prl for static pluginsOswald Buddenhagen2011-05-061-1/+1
* | | | Merge remote branch 'origin/4.8' into qa-review-masterRohan McGovern2011-05-1528-209/+249
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-05-118-51/+41
| |\ \ \ | | |/ / | |/| |
| | * | fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76eJoerg Bornemann2011-05-111-2/+2
| | * | qmake vc(x)proj generator: support x64 Qt buildsJoerg Bornemann2011-05-062-9/+14
| | * | qmake: remove dead code from VcxprojGeneratorJoerg Bornemann2011-05-062-28/+0
| | * | qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-054-14/+27
| * | | qmake: Introduce new template typeChristian Kandeler2011-05-034-4/+26
| * | | Fix wrong merge of 3aa39b0164ce4bb9eOlivier Goffart2011-04-191-1/+1
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-187-56/+83
| |\ \ \ | | | |/ | | |/|
| | * | look for makespec in the build dir firstOswald Buddenhagen2011-04-121-3/+3
| | * | make collection of SUBDIRS in solution generator less bizarreOswald Buddenhagen2011-04-122-21/+22
| | * | run depend_command in build dir in VS generators as wellOswald Buddenhagen2011-04-124-4/+18
| | * | fixify target source against build treeOswald Buddenhagen2011-04-121-1/+1
| | * | fix fixifying of QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-6/+10
| | * | dist target: fixify OBJECTS_DIR against output dirOswald Buddenhagen2011-04-121-1/+2
| | * | fix paths of vpath-resolved filesOswald Buddenhagen2011-04-121-4/+3
| | * | simplify: absolute fixification ignores the base dir argumentsOswald Buddenhagen2011-04-121-1/+1
| | * | simplify: fileFixify for all same paths is always "."Oswald Buddenhagen2011-04-121-3/+1
| | * | simplify: the input and output dirs are already normalizedOswald Buddenhagen2011-04-121-1/+1
| | * | stop fixifying after first successOswald Buddenhagen2011-04-121-0/+1
| | * | create a pwd string with a trailing slash only on demandOswald Buddenhagen2011-04-121-6/+7
| | * | useful location reporting for errors from QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-123-1/+16
| | * | prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"Oswald Buddenhagen2011-04-121-7/+7
| * | | 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 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
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Don't cache resolved paths in MakefileGenerator::fileFixify().Andreas Kling2011-03-152-60/+0
| * | | | | | | | Option::fixString: Don't recreate same QRegExp on each function call.Andreas Kling2011-03-151-1/+1
| * | | | | | | | Option::fixString: Avoid double hash lookups for cache hits.Andreas Kling2011-03-151-4/+6
* | | | | | | | | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefileRohan McGovern2011-05-121-4/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
generated by cgit v0.12 at 2024-12-28 14:11:08 (GMT)