summaryrefslogtreecommitdiffstats
path: root/qmake/generators
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-207-242/+13
|\
| * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-196-146/+12
| * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-191-96/+1
| * Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-191-1/+96
| * Revert "Factored epocRoot implementation out of qmake"axis2010-02-196-12/+146
| * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-186-146/+12
| * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-181-96/+1
* | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+1
|\ \ | |/
| * Use correct (forward slash) separators in qmake-generated bld.infIain2010-02-171-1/+1
* | Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-167-1375/+12
|\ \
| * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-137-1375/+12
| |\ \
| | * | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-121-5/+1
| | * | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | * | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-121-14/+2
| | * | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-123-1337/+0
| | * | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | * | remove remainder of mac9 modeOswald Buddenhagen2010-02-122-7/+3
| | * | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-122-4/+1
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-4/+30
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-122-3/+34
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-162-5/+62
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-4/+30
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-091-1/+1
| |\
| | * Make generate uid3 (symbian) work on 64 bit host platform.Thomas Zander2010-02-081-1/+1
| * | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-091-2/+33
| |/
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-17/+69
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-051-0/+13
| |\
| | * Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| * | Fixed the location where bootstrap.sis is looked for.Miikka Heikkinen2010-02-041-1/+1
| * | Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-041-17/+69
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-041-0/+13
|\ \
| * | Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-046-36/+81
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-026-37/+41
| |\
| | * qmake: subdirs template: make distclean target use QMAKE_DISTCLEANOswald Buddenhagen2010-02-011-0/+1
| | * qmake: fix warningsOswald Buddenhagen2010-02-014-20/+22
| | * qmake: Remove macro and simplify string expression previously using itOswald Buddenhagen2010-02-011-2/+3
| | * qmake: use isActiveConfig() instead of hand-crafting comparisonsOswald Buddenhagen2010-02-013-15/+15
| * | Added support for ifdeffing for manufacturer in generated pkg filesMiikka Heikkinen2010-01-281-0/+40
| |/
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas...Pulse Build System2010-01-224-23/+59
|\ \
| * \ Merge branch 'merge-request-1601' into master-s60axis2010-01-054-23/+59
| |\ \
| | * | Improving parts of commit 2d8d855d.axis2009-11-171-10/+20
| | * | qmake: add Linux host support to Symbian generatorAnderson Lizardo2009-11-174-23/+53
* | | | Merge branch '4.6'Thiago Macieira2010-01-214-9/+31
|\ \ \ \ | | |_|/ | |/| |
| * | | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-204-9/+31
* | | | Merge branch '4.6'Thiago Macieira2010-01-181-8/+6
|\ \ \ \ | |/ / /
| * | | Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
| * | | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
* | | | Merge branch '4.6'Thiago Macieira2010-01-1338-38/+38
|\ \ \ \ | |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0938-38/+38
| |\ \ \
generated by cgit v0.12 at 2024-11-29 13:21:36 (GMT)