Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-10-29 | 1 | -2/+2 |
|\ | |||||
| * | Correct RVCT4 parameter so it applies to all 4.x versions, not just 4.0 | Iain | 2010-10-29 | 1 | -2/+2 |
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2010-10-29 | 8 | -5/+588 |
|\ \ | |/ |/| | |||||
| * | Fix the license in files for Lighthouse | Jørgen Lind | 2010-10-28 | 2 | -78/+78 |
| * | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-27 | 11 | -38/+67 |
| |\ | |||||
| * \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-26 | 11 | -12/+317 |
| |\ \ | |||||
| * \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 62 | -604/+461 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-10-22 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix QWS generic mac mkspec | Jørgen Lind | 2010-10-20 | 1 | -1/+1 |
| | * | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-10-05 | 15 | -57/+211 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-09-13 | 17 | -93/+114 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'qt-4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-26 | 2 | -1/+27 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 5 | -51/+79 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 15 | -41/+168 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 29 | -104/+139 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 2 | -1/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 2 | -5/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 20 | -43/+102 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 64 | -84/+144 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-08-03 | 7 | -35/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-07-14 | 21 | -101/+135 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-06-24 | 4 | -3/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse | Paul Olav Tvete | 2010-06-18 | 51 | -209/+584 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Say hello to Qt for Native Client. | Morten Johan Sørvig | 2010-05-14 | 5 | -2/+523 |
| * | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-05-10 | 61 | -81/+216 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into lighthouse | Jørgen Lind | 2010-04-21 | 42 | -383/+1087 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Stub out QtOpenGL on Lighthouse & get it compiling | Tom Cooksey | 2010-03-31 | 1 | -4/+0 |
| * | | | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-18 | 6 | -57/+141 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into 4.7-lighthouse | Jørgen Lind | 2010-03-11 | 4 | -2/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-01 | 158 | -3846/+1223 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'remotes/qt/4.6' into lighthouse | Paul Olav Tvete | 2010-02-10 | 6 | -18/+80 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.6' into lighthouse | Paul Olav Tvete | 2010-01-14 | 142 | -342/+457 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Add experimental OpenKODE support | Harald Fernengel | 2009-12-04 | 2 | -0/+64 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Fix some build issues for building Qt for Symbian on Mac OS X. | Liang Qi | 2010-10-27 | 2 | -1/+3 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'macMakefileBuildSupport' into master. | Liang Qi | 2010-10-26 | 11 | -38/+67 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | Got rid of some "duplicate library" warnings. | axis | 2010-10-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | Changed various qmake constructs to support Windows. | axis | 2010-10-21 | 2 | -9/+28 |
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed various quotation problems when porting to Windows. | axis | 2010-10-21 | 2 | -8/+13 |
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed some preprocessor parameters for Mac support. | axis | 2010-10-21 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | Added detection of bat files to the qtPrepareTool function. | axis | 2010-10-21 | 1 | -1/+7 |
| * | | | | | | | | | | | | | | | | | | | | | | | Renamed the symbian/linux-* mkspecs to symbian-*. | axis | 2010-10-21 | 8 | -18/+18 |
| * | | | | | | | | | | | | | | | | | | | | | | | Fixed library ordering when linking to qtmain. | axis | 2010-10-21 | 1 | -2/+7 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 3 | -4/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-18 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Prepend epocroot to extra target tools if they start with /epoc32/ | Miikka Heikkinen | 2010-10-18 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | qmake/symbian: Make sure the destination directory exists before copying | Martin Storsjo | 2010-10-18 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-10-13 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | use specified pkg-config | Mark Brand | 2010-10-11 | 1 | -3/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linux-clang license header | Tor Arne Vestbø | 2010-10-21 | 1 | -19/+19 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Add mkspecs for Clang on Linux and Mac OS X | Tor Arne Vestbø | 2010-10-20 | 7 | -0/+291 |