Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-06 | 20 | -54/+81 |
|\ | |||||
| * | mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf | Tor Arne Vestbø | 2010-11-05 | 3 | -13/+10 |
| * | mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly | Tor Arne Vestbø | 2010-11-05 | 1 | -1/+2 |
| * | mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior | Tor Arne Vestbø | 2010-11-05 | 1 | -2/+3 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-05 | 19 | -45/+73 |
| |\ | |||||
| | * | There is no predefined qmake x11 scope for x11 builds. | Robert Griebl | 2010-11-03 | 1 | -0/+3 |
| | * | Don't use scopes in mkspecs as configure does not support them | Tor Arne Vestbø | 2010-11-02 | 9 | -13/+28 |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-10-29 | 14 | -38/+48 |
| | |\ | |||||
| | | * | Merge remote branch 'scm/qt/master' | Tor Arne Vestbø | 2010-10-28 | 2 | -1/+2 |
| | | |\ | |||||
| | | * | | mkspecs: Emit warning when including g++.conf directly | Tor Arne Vestbø | 2010-10-27 | 14 | -37/+48 |
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-05 | 3 | -19/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Use qtmain.lib to provide entry point for all Symbian applications | Miikka Heikkinen | 2010-11-04 | 3 | -19/+7 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-04 | 4 | -4/+4 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | |||||
| * | | | msvc: enable unreferenced code elimination in release with debuginfo builds | Oswald Buddenhagen | 2010-11-03 | 4 | -4/+4 |
* | | | | 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 |