| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b... | Kent Hansen | 2009-07-30 | 5 | -22/+12 |
|\ |
|
| * | Port of Qt to QNX | Harald Fernengel | 2009-07-29 | 5 | -22/+12 |
|
|
* | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-28 | 9 | -48/+81 |
|\ \
| |/ |
|
| * | Fix qmake.pro so it can build qmake. | Jason Barron | 2009-07-27 | 1 | -0/+1 |
|
|
| * | Fix qmake dependency generation for include statements with local files. | Simon Hausmann | 2009-07-27 | 1 | -8/+6 |
|
|
| * | 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 |
|
|
| * | Compile fix on windows. | Denis Dzyubenko | 2009-07-16 | 3 | -6/+6 |
|
|
| * | Changed the implementation of the unicode text codecs to share more code with... | Denis Dzyubenko | 2009-07-16 | 5 | -1/+29 |
|
|
* | | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-14 | 4 | -53/+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 | 3 | -49/+13 |
|
|
| * | 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 branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-06-29 | 40 | -80/+86 |
|\ \ \
| |/ / |
|
| * | | 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 |
|
|
* | | | Import JSC-based Qt Script from Kent's tree. | Simon Hausmann | 2009-06-16 | 5 | -648/+5 |
|/ / |
|
* | | 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 |
|\ \
| |/ |
|
| * | link qmake without /DEBUG on Windows | Joerg Bornemann | 2009-06-05 | 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 |
|\ \
| |/ |
|
| * | Allow qmake to compile using it's .pro file. | Jason Barron | 2009-06-03 | 1 | -1/+1 |
|
|
* | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-06-02 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Remove the fixFilename() usage from the solution generator | Marius Storm-Olsen | 2009-05-29 | 1 | -1/+1 |
|
|
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-27 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Fixed qmake writing targets into the root of the current drive when | Rohan McGovern | 2009-05-26 | 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 |
|\ \
| |/ |
|
| * | Use isNull() for strings instead of comparing against QString(). | Jesper Thomschütz | 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 |
|\ \
| |/ |
|
| * | Changed include file name to lowercase to be able to crosscompile win32-g++ v... | Denis Dzyubenko | 2009-04-28 | 1 | -1/+1 |
|
|
* | | Merge branch '4.5' | Rhys Weatherley | 2009-04-21 | 1 | -3/+15 |
|\ \
| |/ |
|
| * | Missing debug .rc file with a clean shadow build | Lincoln Ramsay | 2009-04-21 | 1 | -3/+15 |
|
|
* | | Merge commit 'origin/4.5' | Bjoern Erik Nilsen | 2009-04-07 | 2 | -3/+1 |
|\ \
| |/ |
|
| * | qmake: additional compiler options were written twice into vcproj files | Joerg Bornemann | 2009-04-07 | 1 | -2/+0 |
|
|
| * | fix QMAKE_VAR_FIRST_ expansion in compiler flags | Oswald Buddenhagen | 2009-04-07 | 1 | -1/+1 |
|
|
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-02 | 5 | -17/+11 |
|\ \
| |/ |
|
| * | Small changes in qmake's fileFixify | João Abecasis | 2009-04-02 | 1 | -9/+3 |
|
|
| * | Spring cleaning in qmake tests | João Abecasis | 2009-04-02 | 3 | -5/+5 |
|
|