Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-10-07 | 1 | -1/+44 |
|\ | |||||
| * | Always recreate backing store when TLW transparency changes | Gareth Stockwell | 2011-09-27 | 1 | -1/+44 |
* | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-06-29 | 1 | -0/+14 |
|\ \ | |||||
| * \ | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-06-22 | 1 | -0/+14 |
| |\ \ | | |/ | |||||
| | * | Fix infinite recursion when changing geometry on Mac | Gabriel de Dietrich | 2011-05-26 | 1 | -0/+14 |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 3 | -52/+52 |
| | |\ | |||||
| | | * | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 3 | -52/+52 |
* | | | | Cocoa: fix qwidget auto test failures | Richard Moe Gustavsen | 2011-06-29 | 1 | -0/+19 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 1 | -19/+56 |
|\ \ \ | |||||
| * \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-05-17 | 1 | -0/+25 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-06 | 1 | -0/+25 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fixes crash in QWidget::effectiveWinId. | Bjørn Erik Nilsen | 2011-05-02 | 1 | -0/+25 |
| | | |/ | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-... | Qt Continuous Integration System | 2011-05-17 | 1 | -3/+2 |
| |\ \ \ | |||||
| | * | | | Remove mention of Q_ASSERT in comments | Jason McDonald | 2011-05-04 | 1 | -1/+1 |
| | * | | | Reduce usage of Q_ASSERT in autotests. | Jason McDonald | 2011-04-12 | 1 | -2/+1 |
| | |/ / | |||||
| * | | | Fix the autotest condition. | Fabien Freling | 2011-05-03 | 1 | -15/+27 |
| * | | | Fix the update() autotest for raster. | Fabien Freling | 2011-05-02 | 1 | -1/+2 |
| |/ / | |||||
* | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 3 | -52/+52 |
|/ / | |||||
* | | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-08 | 3 | -60/+92 |
|\ \ | |||||
| * | | Cocoa: enable more autotests for qwidget as a result of Alien | Richard Moe Gustavsen | 2011-01-19 | 1 | -6/+9 |
| * | | Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) | Richard Moe Gustavsen | 2011-01-19 | 1 | -17/+24 |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alie... | Richard Moe Gustavsen | 2011-01-17 | 3 | -20/+25 |
| |\ \ | |||||
| * | | | Alien implementation for the Cocoa port | Richard Moe Gustavsen | 2011-01-17 | 3 | -37/+59 |
* | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 3 | -3/+3 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 3 | -3/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 3 | -3/+3 |
* | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-22 | 1 | -27/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 1 | -27/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Non-hacky fix for qwidget autotest | Miikka Heikkinen | 2010-12-13 | 1 | -27/+5 |
* | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-15 | 1 | -5/+27 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-13 | 1 | -5/+27 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix qwidget test crash | Miikka Heikkinen | 2010-12-10 | 1 | -5/+27 |
* | | | | Compile fix on solaris | Thierry Bastian | 2010-11-26 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 1 | -12/+17 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Fixed tst_qwidget::winIdChangeEvent | Gareth Stockwell | 2010-11-24 | 1 | -12/+17 |
* | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into... | Qt Continuous Integration System | 2010-10-29 | 1 | -11/+27 |
|\ \ | |||||
| * \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 1 | -0/+33 |
| |\ \ | |||||
| * \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-09-13 | 1 | -0/+25 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 1 | -1/+74 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 1 | -1/+74 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-08-03 | 1 | -3/+24 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 1 | -27/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-04 | 1 | -3/+24 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Autotest fixes for Lighthouse | Paul Olav Tvete | 2010-07-21 | 1 | -2/+15 |
| * | | | | | | | | Add Lighthouse #ifdefs | Paul Olav Tvete | 2010-07-20 | 1 | -7/+7 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-06-24 | 1 | -19/+8 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse | Paul Olav Tvete | 2010-06-18 | 1 | -9/+360 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into lighthouse | Jørgen Lind | 2010-04-21 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-18 | 1 | -0/+57 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into 4.7-lighthouse | Jørgen Lind | 2010-03-11 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ |