summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-217-33/+100
* Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-2112-45/+151
* Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-2014-249/+70
|\
| * Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-2014-248/+69
| |\
| | * Fixed linkage failure when building qmake on Unix platformsGareth Stockwell2010-02-191-2/+0
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1912-151/+40
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-197-100/+34
| | * Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-197-34/+100
| | * Revert "Factored epocRoot implementation out of qmake"axis2010-02-1912-40/+151
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1812-151/+40
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-187-100/+34
| * | 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
* | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-195-134/+0
|/ /
* | Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-1616-1420/+23
|\ \
| * \ Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1316-1420/+23
| |\ \
| | * | 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-128-1356/+6
| | * | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | * | remove remainder of mac9 modeOswald Buddenhagen2010-02-125-24/+6
| | * | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-123-12/+2
| | * | simplifyOswald Buddenhagen2010-02-121-1/+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-123-7/+44
| |\ \ \ | | |_|/ | |/| |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-163-9/+72
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | 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
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-091-2/+33
| |\ \
| | * | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-091-2/+33
| | |/
| * | Added QMake directory to INCPATH so the compiler can find required headersConstantin Makshin2010-02-081-4/+10
| |/
* | 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-049-41/+87
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-031-1/+1
| |\
| | * Fixed QFileInfo::absolutePath() warning when running "qmake -project"Andreas Kling2010-02-031-1/+1
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-028-41/+46
| |\ \ | | |/ | |/|
| | * qmake: subdirs template: make distclean target use QMAKE_DISTCLEANOswald Buddenhagen2010-02-011-0/+1
| | * qmake: fix warningsOswald Buddenhagen2010-02-016-24/+27
| | * 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
|\ \
generated by cgit v0.12 at 2024-11-09 14:53:20 (GMT)