Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mainline/master' | Oswald Buddenhagen | 2011-04-14 | 60 | -606/+807 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-13 | 2 | -17/+12 |
| |\ | |||||
| * \ | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-13 | 6 | -6/+39 |
| |\ \ | |||||
| | * \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-12 | 6 | -6/+39 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 2 | -4/+27 |
| | | |\ \ | |||||
| | | | * | | Allow enum values to be used as signal parameters | Bea Lam | 2011-04-12 | 1 | -1/+27 |
| | | | * | | ListModel::clear() should not clear roles | Bea Lam | 2011-04-12 | 1 | -3/+0 |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int... | Qt Continuous Integration System | 2011-04-11 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Cocoa: Fixup wrong code in patch baaa5ae | Richard Moe Gustavsen | 2011-04-11 | 1 | -1/+1 |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-04-11 | 3 | -1/+11 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Make sure removed QTextBlock is invalid | Jiang Jiang | 2011-04-11 | 3 | -1/+11 |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-12 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging | aavit | 2011-04-12 | 1 | -1/+9 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Update XCreateWindow in qgl_X11egl.cpp | JuanZhao | 2011-04-12 | 1 | -1/+9 |
| | | * | | | | | | | Merge remote branch 'qt-mainline/master' | aavit | 2011-04-07 | 28 | -254/+1169 |
| | | |\ \ \ \ \ \ \ | |||||
| * | | \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas... | Qt Continuous Integration System | 2011-04-11 | 5 | -170/+180 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Updated QtOpenGL DEF file | Eckhart Koppen | 2011-04-08 | 1 | -1/+1 |
| | * | | | | | | | | | | Merge remote-tracking branch 'qt-master/master' | Eckhart Koppen | 2011-04-08 | 149 | -8952/+2225 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Updated QtOpenVG DEF file | Eckhart Koppen | 2011-04-06 | 1 | -4/+6 |
| | * | | | | | | | | | | | Merge remote-tracking branch 'qt-master/master' | Eckhart Koppen | 2011-04-06 | 17 | -222/+1013 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'qt-master/master' | Eckhart Koppen | 2011-04-05 | 336 | -61944/+29077 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Updated QtGui DEF file for ARMV5 | Eckhart Koppen | 2011-04-04 | 1 | -0/+3 |
| | * | | | | | | | | | | | | | Updated DEF files | Eckhart Koppen | 2011-04-01 | 6 | -9/+35 |
| | * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-01 | 25 | -107/+112 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt-master/master' | Guoqing Zhang | 2011-04-11 | 158 | -8959/+2301 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-09 | 3 | -20/+31 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-09 | 3 | -20/+31 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-04-09 | 2 | -17/+30 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) | Arnold Konrad | 2011-04-08 | 1 | -9/+25 |
| | | | | * | | | | | | | | | | | | HTTP cacheing: do not store the date header with the resource | Peter Hartmann | 2011-04-08 | 1 | -8/+5 |
| | | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-04-08 | 1 | -3/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / | | | | | |/| | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | Let's not write to the source buffer when blending argb32 on rgb16. | Samuel Rødal | 2011-04-08 | 1 | -3/+1 |
| | * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-... | Qt Continuous Integration System | 2011-04-09 | 3 | -13/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qa-review/master' into qa-staging-master | Rohan McGovern | 2011-04-07 | 3 | -13/+13 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | Fix typos in QSharedPointer documentation. | Jason McDonald | 2011-04-06 | 1 | -11/+11 |
| | | | * | | | | | | | | | | | | | | | Merge qt/qt.git master into qa-team-master | Rohan McGovern | 2011-03-24 | 878 | -10790/+50350 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 3970 | -3982/+3982 |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-08 | 8 | -36/+63 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-08 | 8 | -36/+63 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| | | / / / / / / / / / / / / / | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int... | Qt Continuous Integration System | 2011-04-08 | 4 | -24/+34 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | Cocoa: p1 bug fix: fix auto test regressions | Richard Moe Gustavsen | 2011-04-07 | 1 | -5/+10 |
| | | | | * | | | | | | | | | | | | | | Cocoa: p1 bug fix: revert use of subWindowStacking | Richard Moe Gustavsen | 2011-04-06 | 4 | -24/+29 |
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-07 | 2 | -10/+22 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | Image w/ PreserveAspectFit has its width changed once more than needed. | Martin Jones | 2011-04-07 | 2 | -10/+22 |
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-04-07 | 2 | -2/+7 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | Ensure shared network session deleted from correct thread | Shane Kearns | 2011-04-07 | 1 | -1/+6 |
| | | | | * | | | | | | | | | | | | | | Revert "Remove SIGBUS emission from QNetworkSession destruction." | Adrian Constantin | 2011-04-07 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-04-08 | 1 | -4/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | fix QLocalSocket::isValid() on Windows | Joerg Bornemann | 2011-04-06 | 1 | -4/+1 |
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-07 | 8 | -138/+133 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | / / / | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | |