Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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-upstream' | Gabriel de Dietrich | 2011-02-08 | 1 | -59/+36 |
|\ \ | |||||
| * | | 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 | 1 | -18/+23 |
| |\ \ | |||||
| * | | | Alien implementation for the Cocoa port | Richard Moe Gustavsen | 2011-01-17 | 1 | -36/+3 |
* | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1 | -1/+1 |
* | | | | 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 '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 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'remotes/qt/4.6' into lighthouse | Paul Olav Tvete | 2010-02-10 | 1 | -0/+249 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Handle RGB_32 format pixmaps correctly | Paul Olav Tvete | 2010-01-25 | 1 | -2/+5 |
| * | | | | | | | | | | | | revert parts of 10392eef4fd4f9 | Joerg Bornemann | 2010-01-25 | 1 | -26/+24 |
* | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-27 | 1 | -3/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Remove widget subtree from backing store tracker when reparented | Gareth Stockwell | 2010-10-26 | 1 | -3/+21 |
* | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Made the Symbian menu close when switching native focus. | axis | 2010-09-27 | 1 | -0/+33 |
* | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Fixed a case where a newly created native widget would lose focus. | axis | 2010-09-01 | 1 | -0/+25 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 1 | -1/+74 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Removed QEXPECT_FAIL macros for test case which now passes | Gareth Stockwell | 2010-08-18 | 1 | -1/+0 |
| * | | | | | | | | Test backing store is deleted after reparenting a visible native child widget | Gareth Stockwell | 2010-08-18 | 1 | -0/+37 |
| * | | | | | | | | Test backing store is deleted after: partial reveal, full reveal, hide | Gareth Stockwell | 2010-08-18 | 1 | -0/+37 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Remove obsolete code & workarounds for unsupported versions of MS Visual C++ | miniak | 2010-08-03 | 1 | -27/+1 |
|/ / / / / / / | |||||
* | | | | | | | Removed QEXPECT_FAIL macros from test cases which now pass | Gareth Stockwell | 2010-07-26 | 1 | -3/+1 |
* | | | | | | | Drawer widget in a MainWindow disappears after returning from full screen mode. | Carlos Manuel Duclos Vergara | 2010-07-23 | 1 | -0/+23 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6 | Simon Hausmann | 2010-06-20 | 1 | -19/+8 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | |