summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-256-22/+16
|\
| * Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-123-17/+5
| |\
| | * do not make PWD and OUT_PWD have trailing slashes upon returning from a SUBDI...Oswald Buddenhagen2009-06-111-6/+5
| | * do not append trailing slash to OUT_PWD in nested pro-filesOswald Buddenhagen2009-06-111-2/+0
| | * remove strange no-opOswald Buddenhagen2009-06-111-1/+0
| | * remove dead codeOswald Buddenhagen2009-06-111-8/+0
| * | Remove var->QMAKE_COMP_var docs, and mark feature unsupported.Marius Storm-Olsen2009-06-111-0/+1
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-1/+1
| |\ \ | | |/
| * | Made qmake handle "no_default" config for sub targetsJ-P Nurmi2009-06-051-1/+6
| * | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-1/+1
| |\ \
| * \ \ Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-021-1/+1
| |\ \ \
| * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-1/+1
| |\ \ \ \
| * | | | | less inefficientOswald Buddenhagen2009-05-181-1/+1
| * | | | | Merge branch '4.5'Thiago Macieira2009-05-141-1/+1
| |\ \ \ \ \
| * | | | | | Remove unused file qfileinfo_p.hMarius Storm-Olsen2009-05-131-1/+0
| * | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.5'Rhys Weatherley2009-04-211-3/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-072-3/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-025-17/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-03-271-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Long live Qt!Lars Knoll2009-03-2347-0/+27151
| / / / / / / / / / /
* | | | | | | | | | | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-111-2/+10
* | | | | | | | | | | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly forRohan McGovern2009-06-113-46/+70
* | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | link qmake without /DEBUG on WindowsJoerg Bornemann2009-06-051-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Allow qmake to compile using it's .pro file.Jason Barron2009-06-031-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Make qmake compile from .pro on other platforms.Jason Barron2009-06-031-1/+6
* | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-0310-10/+310
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'imSelections'axis2009-06-0310-10/+310
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed incorrect headers.axis2009-06-0310-10/+310
* | | | | | | | | | | Removed DEPENDS keyword from resource blocks of generated mmp files from symb...Miikka Heikkinen2009-06-031-2/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-022-2/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-022-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | Remove the fixFilename() usage from the solution generatorMarius Storm-Olsen2009-05-291-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Fixed qmake writing targets into the root of the current drive whenRohan McGovern2009-05-261-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Removed unused function from symmakeMiikka Heikkinen2009-06-022-4/+0
|/ / / / / / /
* | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Use isNull() for strings instead of comparing against QString().Jesper Thomschütz2009-05-141-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Improved Linux compatibility for Symbian builds.Miikka Heikkinen2009-05-151-2/+7
* | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-061-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-061-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Changed include file name to lowercase to be able to crosscompile win32-g++ v...Denis Dzyubenko2009-04-281-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | Added VERSION keyword generation to mmp filesMiikka Heikkinen2009-05-062-0/+42
|/ / / / /
* | | | | Fixed symbian-sbsv2 ICON keyword so that it will generate iconsMiikka Heikkinen2009-04-301-0/+1
* | | | | Changed generated file headers to have timestamp in ISO format insteadMiikka Heikkinen2009-04-282-8/+8
* | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-281-1/+1
|\ \ \ \ \
| * | | | | Removed preserving read-only flag from winscw deployed files to makeMiikka Heikkinen2009-04-281-1/+1
* | | | | | Re-enabled winscw target for non-OS_WIN builds.Miikka Heikkinen2009-04-281-6/+4
|/ / / / /
* | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-2710-27/+32
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-04-271-1/+1
| |\ \ \ \ \