Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' | Jason Barron | 2009-08-04 | 9 | -252/+230 |
|\ | |||||
| * | Whitespace, comment, and dead code cleanup for qmake | Miikka Heikkinen | 2009-08-04 | 9 | -219/+147 |
| * | Removed unused method from SymbianMakefileGenerator. | Janne Anttila | 2009-07-29 | 2 | -14/+0 |
| * | Fixed some tab/space usage in symmake.cpp | Janne Anttila | 2009-07-29 | 1 | -20/+20 |
| * | Extended PKG customization possibilities via qmake. | Janne Anttila | 2009-07-29 | 2 | -22/+85 |
| * | Changed .pkg files to follow the naming scheme of make targets. | Janne Anttila | 2009-07-28 | 1 | -2/+3 |
* | | Merge commit 'qt/master-stable' | Jason Barron | 2009-08-04 | 2 | -12/+10 |
|\ \ | |||||
| * | | Port of Qt to QNX | Harald Fernengel | 2009-07-29 | 2 | -12/+10 |
* | | | Merge commit 'qt/master-stable' | Jason Barron | 2009-07-29 | 1 | -8/+6 |
|\ \ \ | |/ / | |||||
| * | | Fix qmake dependency generation for include statements with local files. | Simon Hausmann | 2009-07-27 | 1 | -8/+6 |
* | | | Merge commit 'qt/master-stable' | Jason Barron | 2009-07-27 | 3 | -71/+47 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | micro-optimization of some string operations | Oswald Buddenhagen | 2009-07-17 | 1 | -18/+18 |
| * | some directory separator cleanup | Oswald Buddenhagen | 2009-07-17 | 2 | -15/+21 |
| * | fix bug in qmake DEPLOYMENT variable | Joerg Bornemann | 2009-07-13 | 1 | -2/+1 |
| * | qmake: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support | Marius Storm-Olsen | 2009-07-01 | 1 | -36/+7 |
* | | Made deployment paths with drive letters work. | axis | 2009-07-13 | 1 | -1/+5 |
* | | Merge commit 'origin/master' into 4.6-merged | Jason Barron | 2009-07-09 | 4 | -113/+108 |
|\ \ | |||||
| * \ | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-07-01 | 1 | -1/+3 |
| |\ \ | |||||
| | * \ | Merge branch 'warningRemovals' | axis | 2009-06-30 | 1 | -1/+3 |
| | |\ \ | |||||
| | | * | | Removed warnings on Symbian. | axis | 2009-06-30 | 1 | -1/+3 |
| * | | | | Added temporary include file generation to symbian-sbsv2 generator | Miikka Heikkinen | 2009-07-01 | 4 | -112/+105 |
| |/ / / | |||||
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-06-29 | 29 | -69/+70 |
| |\ \ \ | | |/ / | |/| | | |||||
* | | | | Merge commit 'qt/master-stable' into 4.6-merged | Jason Barron | 2009-06-30 | 29 | -60/+65 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch '4.5' | Thiago Macieira | 2009-06-24 | 1 | -2/+7 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Do not crash qmake if MAKEFILE_GENERATOR is not defined in a loaded .pr* file | Keith Isdale | 2009-06-24 | 1 | -2/+7 |
| * | | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 29 | -58/+58 |
| |\ \ \ | | |/ / | |||||
| | * | | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 29 | -58/+58 |
* | | | | Merge commit 'qt/master-stable' into 4.6-stable | Jason Barron | 2009-06-25 | 4 | -12/+15 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Merge commit 'origin/4.5' | Bjørn Erik Nilsen | 2009-06-12 | 2 | -9/+5 |
| |\ \ | | |/ | |||||
| | * | do not make PWD and OUT_PWD have trailing slashes upon returning from a SUBDI... | Oswald Buddenhagen | 2009-06-11 | 1 | -6/+5 |
| | * | do not append trailing slash to OUT_PWD in nested pro-files | Oswald Buddenhagen | 2009-06-11 | 1 | -2/+0 |
| | * | remove strange no-op | Oswald Buddenhagen | 2009-06-11 | 1 | -1/+0 |
| * | | Remove var->QMAKE_COMP_var docs, and mark feature unsupported. | Marius Storm-Olsen | 2009-06-11 | 1 | -0/+1 |
| * | | Made qmake handle "no_default" config for sub targets | J-P Nurmi | 2009-06-05 | 1 | -1/+6 |
| * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-06-02 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-27 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch '4.5' | Thiago Macieira | 2009-05-14 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.5' | Rhys Weatherley | 2009-04-21 | 1 | -3/+15 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit 'origin/4.5' | Bjoern Erik Nilsen | 2009-04-07 | 2 | -3/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-02 | 4 | -16/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '4.5' | Thiago Macieira | 2009-03-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Long live Qt! | Lars Knoll | 2009-03-23 | 29 | -0/+19549 |
| / / / / / / / | |||||
* | | | | | | | | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly for | Rohan McGovern | 2009-06-11 | 1 | -2/+10 |
* | | | | | | | | Fixed recursive QMAKE_EXTRA_TARGETS not being generated correctly for | Rohan McGovern | 2009-06-11 | 3 | -46/+70 |
* | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-03 | 8 | -8/+248 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'imSelections' | axis | 2009-06-03 | 8 | -8/+248 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixed incorrect headers. | axis | 2009-06-03 | 8 | -8/+248 |
* | | | | | | | | | | Removed DEPENDS keyword from resource blocks of generated mmp files from symb... | Miikka Heikkinen | 2009-06-03 | 1 | -2/+3 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-02 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-06-02 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | |