summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-2551-69/+69
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | 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
| * | | | | | | | | | | Using TLS to store QThreadData on Symbianmread2010-10-211-8/+38
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-10-217-13/+14
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Functions that are externally defined to QtOpenGL needs to be imported.Jani Hautakangas2010-10-216-11/+11
| * | | | | | | | | | | | Added include for missing file for Symbian3Titta Heikkala2010-10-211-0/+3
| * | | | | | | | | | | | Support for clipboard between Qt and Symbian applicationsTitta Heikkala2010-10-211-10/+75
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2211-240/+438
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2111-240/+438
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fall back to Qt for loading images with DICAPS_COLORKEY.Anders Bakken2010-10-211-7/+11
| | * | | | | | | | | | Implement QWidget::metric PdmNumColors for QWSAnders Bakken2010-10-211-0/+24
| | * | | | | | | | | | Adding ::scroll capabilities to live pixmaps.Michael Dominic K2010-10-212-3/+70
| | * | | | | | | | | | Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-219-233/+336
| | | |_|/ / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Fix Flipable docsBea Lam2010-10-221-13/+14
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-211-2/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unnecessary roundingAlan Alpert2010-10-211-2/+0