summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-212-0/+6
|\
| * Export IPHONEOS_DEPLOYMENT_TARGET from qmakeIan2011-06-202-0/+6
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2444-812/+859
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-05-202-4/+42
| |\
| | * Improve DEFINES crossplatform compatibility in Symbian builds.Miikka Heikkinen2011-05-162-4/+42
| * | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-5/+2
| |\ \
| | * \ 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-1515-137/+158
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefileRohan McGovern2011-05-121-4/+1
| * | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1344-750/+750
| | |/ / / | |/| | |
| * | | | 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
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-035-47/+59
|\ \ \ \ \ | |/ / / /
| * | | | 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-185-46/+58
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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-121-1/+1
| | * | | 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
* | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-271-0/+1
|/ / / / /
* | | | | 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-052-4/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Fix emulator deployment for items with "!:" drive.Miikka Heikkinen2011-03-161-1/+4
| * | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-169-68/+51
| |\ \ \ \ \