Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | 40 | -99/+98 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | ||||||
* | | | | | | Merge commit 'qt/master-stable' into 4.6-merged | Jason Barron | 2009-06-30 | 40 | -82/+93 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | 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 | 40 | -80/+86 | |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | ||||||
| | * | | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 40 | -80/+80 | |
| | * | | disable stdout buffering alltogether | Oswald Buddenhagen | 2009-06-16 | 1 | -6/+3 | |
| | * | | Fixes crash of qmake on Windows Vista Business x64 (and undefined | Rohan McGovern | 2009-06-16 | 1 | -0/+2 | |
| | * | | Force line buffering for stdout so it stays in sync better with stderr (which... | audiofanatic | 2009-06-15 | 1 | -0/+7 | |
* | | | | Merge commit 'qt/master-stable' into 4.6-stable | Jason Barron | 2009-06-25 | 6 | -22/+16 | |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | ||||||
| * | | Merge commit 'origin/4.5' | Bjørn Erik Nilsen | 2009-06-12 | 3 | -17/+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 dead code | Oswald Buddenhagen | 2009-06-11 | 1 | -8/+0 | |
| * | | Remove var->QMAKE_COMP_var docs, and mark feature unsupported. | Marius Storm-Olsen | 2009-06-11 | 1 | -0/+1 | |
| * | | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-06-08 | 1 | -1/+1 | |
| |\ \ | | |/ | ||||||
| * | | Made qmake handle "no_default" config for sub targets | J-P Nurmi | 2009-06-05 | 1 | -1/+6 | |
| * | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-06-04 | 1 | -1/+1 | |
| |\ \ | ||||||
| * \ \ | 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 | |
| |\ \ \ \ | ||||||
| * | | | | | less inefficient | Oswald Buddenhagen | 2009-05-18 | 1 | -1/+1 | |
| * | | | | | Merge branch '4.5' | Thiago Macieira | 2009-05-14 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Remove unused file qfileinfo_p.h | Marius Storm-Olsen | 2009-05-13 | 1 | -1/+0 | |
| * | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-29 | 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 | 5 | -17/+11 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch '4.5' | Thiago Macieira | 2009-03-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Long live Qt! | Lars Knoll | 2009-03-23 | 47 | -0/+27151 | |
| / / / / / / / / / / | ||||||
* | | | | | | | | | | | 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 '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-06-08 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | link qmake without /DEBUG on Windows | Joerg Bornemann | 2009-06-05 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | Allow qmake to compile using it's .pro file. | Jason Barron | 2009-06-03 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Make qmake compile from .pro on other platforms. | Jason Barron | 2009-06-03 | 1 | -1/+6 | |
* | | | | | | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public | Miikka Heikkinen | 2009-06-03 | 10 | -10/+310 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'imSelections' | axis | 2009-06-03 | 10 | -10/+310 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fixed incorrect headers. | axis | 2009-06-03 | 10 | -10/+310 | |
* | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Remove the fixFilename() usage from the solution generator | Marius Storm-Olsen | 2009-05-29 | 1 | -1/+1 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | Fixed qmake writing targets into the root of the current drive when | Rohan McGovern | 2009-05-26 | 1 | -1/+1 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
* | | | | | | | | Removed unused function from symmake | Miikka Heikkinen | 2009-06-02 | 2 | -4/+0 | |
|/ / / / / / / |