summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Remove few unused variables.Miikka Heikkinen2011-09-061-2/+0
* Symbian: Detect app caption and pkg name translations by id attribute.Miikka Heikkinen2011-09-061-33/+28
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-312-2/+2
|\
| * Added missing no_include_pwd checkStyopa Semenukha2011-08-181-1/+1
| * Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-181-1/+1
* | Improved support for shadow builds in Symbian.Miikka Heikkinen2011-08-246-34/+34
|/
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-151-1/+6
|\
| * Ignore child elements in non-application caption/pkg name translationsMiikka Heikkinen2011-08-031-1/+6
| * Update licenseheader text in source filesJyri Tahtela2011-05-1353-901/+901
* | qsystemlibrary needs no special treatmentOswald Buddenhagen2011-06-241-3/+0
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-06-221-1/+1
|\ \
| * | buildfix for qmakeRitt Konstantin2011-06-211-1/+1
* | | 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-2455-999/+1046
|\| |
| * | 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-181-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-071-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-1628-209/+249
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefileRohan McGovern2011-05-131-4/+1
| * | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1355-937/+937
| | |/ / / | |/| | |
| * | | | 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-037-57/+84
|\| | | |
| * | | | 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
* | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-04-271-0/+1
|/ / / /
* | | | Merge earth-team into origin/master'Olivier Goffart2011-04-128-7/+29
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 16:52:49 +0000