summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-268-33/+33
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-268-33/+33
| |\
| | * Run util/normalize on src/declarative.Yann Bodson2010-10-268-33/+33
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-14/+0
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-261-14/+0
| |\ \
| | * | Phonon MMF backend: removed redundant trace outputGareth Stockwell2010-10-251-14/+0
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2614-114/+405
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2514-114/+405
| |\ \ \
| | * | | Simplify calculation of center point and scale for PinchRecongizerFrederik Gladhorn2010-10-251-11/+8
| | * | | Doc: Fixing typoSergio Ahumada2010-10-255-10/+10
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2411-101/+395
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2311-101/+395
| | | |\ \
| | | | * | QtDFB: Make transparent windows behave betterAnders Bakken2010-10-223-17/+29
| | | | * | For meego graphics system, use floyd-steinberg dithering when converting to 1...Michael Dominic K2010-10-223-24/+278
| | | | * | Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-225-60/+88
* | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-2610-22/+46
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2510-22/+46
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2510-22/+46
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-241-3/+11
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2310-34/+129
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2212-253/+452
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-215-15/+46
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2052-2826/+2868
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2052-1333/+1446
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-153-5/+13
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-1481-716/+1516
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Doc: Made Qt::TextLongestVariant internal again.David Boddie2010-10-141-2/+2
| | | * | | | | | | | | Doc: Fixed minor documentation issues.David Boddie2010-10-122-3/+3
| | | * | | | | | | | | Doc: Fixed documentation style and qdoc warnings.David Boddie2010-10-082-6/+6
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0850-175/+423
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-072-9/+5
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0727-324/+1017
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-072-2/+3
| | | * | | | | | | | | | | Doc: Marked some new properties as internal for now.David Boddie2010-10-071-0/+27
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucen...Christian Ehrlicher2010-10-251-0/+2
* | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2551-69/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-2551-69/+69
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-25169-4855/+5060
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-25164-4650/+4874
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fix warning introduced by last commit on hiding of the 'd' memberThiago Macieira2010-10-231-2/+2
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-231-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-221-3/+11
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | | * | | | | | | | | Fix access to uninitialised memory in case of new throwingThiago Macieira2010-10-221-3/+11
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-2210-34/+129
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-10-224-13/+43
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-229-33/+128
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-219-33/+128
| | | | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | QComboBox popup is shown in incorrect location with bottom CBASami Merila2010-10-221-1/+1
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | QS60Style: The QComboBox/QSpinBox text color is not according to themeSami Merila2010-10-211-4/+1