Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-26 | 8 | -33/+33 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-10-26 | 8 | -33/+33 |
| |\ | |||||
| | * | Run util/normalize on src/declarative. | Yann Bodson | 2010-10-26 | 8 | -33/+33 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-26 | 1 | -14/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-26 | 1 | -14/+0 |
| |\ \ | |||||
| | * | | Phonon MMF backend: removed redundant trace output | Gareth Stockwell | 2010-10-25 | 1 | -14/+0 |
* | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-26 | 14 | -114/+405 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-25 | 14 | -114/+405 |
| |\ \ \ | |||||
| | * | | | Simplify calculation of center point and scale for PinchRecongizer | Frederik Gladhorn | 2010-10-25 | 1 | -11/+8 |
| | * | | | Doc: Fixing typo | Sergio Ahumada | 2010-10-25 | 5 | -10/+10 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-24 | 11 | -101/+395 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-10-23 | 11 | -101/+395 |
| | | |\ \ | |||||
| | | | * | | QtDFB: Make transparent windows behave better | Anders Bakken | 2010-10-22 | 3 | -17/+29 |
| | | | * | | For meego graphics system, use floyd-steinberg dithering when converting to 1... | Michael Dominic K | 2010-10-22 | 3 | -24/+278 |
| | | | * | | Added support for blitting to native child widgets in GL window surface. | Samuel Rødal | 2010-10-22 | 5 | -60/+88 |
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-10-26 | 10 | -22/+46 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-25 | 10 | -22/+46 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration | Qt Continuous Integration System | 2010-10-25 | 10 | -22/+46 |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-24 | 1 | -3/+11 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | * | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-23 | 10 | -34/+129 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-22 | 12 | -253/+452 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | * | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-21 | 5 | -15/+46 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-20 | 52 | -2826/+2868 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-20 | 52 | -1333/+1446 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-15 | 3 | -5/+13 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-14 | 81 | -716/+1516 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Doc: Made Qt::TextLongestVariant internal again. | David Boddie | 2010-10-14 | 1 | -2/+2 |
| | | * | | | | | | | | | Doc: Fixed minor documentation issues. | David Boddie | 2010-10-12 | 2 | -3/+3 |
| | | * | | | | | | | | | Doc: Fixed documentation style and qdoc warnings. | David Boddie | 2010-10-08 | 2 | -6/+6 |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-08 | 50 | -175/+423 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Doc: Fixed qdoc warnings. | David Boddie | 2010-10-07 | 2 | -9/+5 |
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-07 | 27 | -324/+1017 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Doc: Fixed qdoc warnings. | David Boddie | 2010-10-07 | 2 | -2/+3 |
| | | * | | | | | | | | | | | Doc: Marked some new properties as internal for now. | David Boddie | 2010-10-07 | 1 | -0/+27 |
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-10-25 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucen... | Christian Ehrlicher | 2010-10-25 | 1 | -0/+2 |
* | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-25 | 51 | -69/+69 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed many spelling errors. | Rohan McGovern | 2010-10-25 | 51 | -69/+69 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-10-25 | 169 | -4855/+5060 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 164 | -4650/+4874 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Fix warning introduced by last commit on hiding of the 'd' member | Thiago Macieira | 2010-10-23 | 1 | -2/+2 |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-10-23 | 1 | -3/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-10-22 | 1 | -3/+11 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | Fix access to uninitialised memory in case of new throwing | Thiago Macieira | 2010-10-22 | 1 | -3/+11 |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-22 | 10 | -34/+129 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7 | Sami Merila | 2010-10-22 | 4 | -13/+43 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-22 | 9 | -33/+128 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |||||
| | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-10-21 | 9 | -33/+128 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | QComboBox popup is shown in incorrect location with bottom CBA | Sami Merila | 2010-10-22 | 1 | -1/+1 |
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | QS60Style: The QComboBox/QSpinBox text color is not according to theme | Sami Merila | 2010-10-21 | 1 | -4/+1 |