summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2314-257/+64
|\
| * Fixed shadow builds on Unix.Rohan McGovern2010-02-231-1/+1
| * Fixed linkage failure when building qmake on Unix platformsGareth Stockwell2010-02-231-2/+0
| * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-2312-151/+40
| * Factored readRegistryKey implementation out of qmakeaxis2010-02-237-100/+34
| * 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
* | | | Fixed copy/paste error after commit a31e40295d.axis2010-02-231-1/+1
* | | | Prevented pkg generation unless there are files to deploy.axis2010-02-221-1/+17
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-195-134/+0
|\ \ \ \ | |/ / /
| * | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-195-134/+0
| |/ /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1816-1420/+23
|\ \ \ | |/ /
| * | 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 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-165-32/+108
|\ \ \ \ \ | |/ / / /
| * | | | 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 remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-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 '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-215-10/+44
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-181-8/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1349-49/+49
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-121-6/+1
| |\ \ \ \ \ \ \ \ \