summaryrefslogtreecommitdiffstats
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
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-2211-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/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-251-0/+38
|\ \ \ \ \
| * | | | | add autotest for QString::setRawData()Oswald Buddenhagen2010-10-251-0/+38
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2597-551/+4338
|\ \ \ \ \ \
| * \ \ \ \ \ 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-2312-34/+213
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2222-414/+522
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-217-16/+138
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-20100-4149/+3851
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-20102-1594/+2872
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed case of a library file name to enable MinGW builds on Fedora.David Boddie2010-10-201-2/+2
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-1513-20/+164
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-14157-1131/+2406
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Doc: Made Qt::TextLongestVariant internal again.David Boddie2010-10-141-2/+2
| * | | | | | | | | | | Doc: Fixed minor documentation issues.David Boddie2010-10-122-3/+3
| * | | | | | | | | | | Doc: Reorganized the platform and compiler notes pages.David Boddie2010-10-087-329/+311
| * | | | | | | | | | | Doc: Removed non-ASCII characters and reformatted the text.David Boddie2010-10-081-140/+140
| * | | | | | | | | | | Doc: Fixed documentation style and qdoc warnings.David Boddie2010-10-084-13/+13
| * | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-081-2/+3
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-08109-1035/+3370
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-072-9/+5
| * | | | | | | | | | | | Doc: Fixed snippet reference for the Getting Started QML guide.David Boddie2010-10-071-1/+1
| * | | | | | | | | | | | Doc: Fixed warnings caused by an earlier change. Made docs consistent.David Boddie2010-10-074-10/+10
| * | | | | | | | | | | | Doc: Fixed warnings caused by an earlier change. Made docs consistent.David Boddie2010-10-079-19/+19
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0740-352/+1063
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Doc: Renamed an external reference to work around an auto-linking issue.David Boddie2010-10-071-1/+1
| * | | | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-071-2/+48
| * | | | | | | | | | | | | Doc: Fixed links to the online BSD license information.David Boddie2010-10-072-2/+3
| * | | | | | | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-072-2/+3
| * | | | | | | | | | | | | Doc: Re-added a link to the Qt site related to testing tools.David Boddie2010-10-072-14/+15
| * | | | | | | | | | | | | Doc: Marked some new properties as internal for now.David Boddie2010-10-071-0/+27
| * | | | | | | | | | | | | Doc: Renamed a project file.David Boddie2010-10-061-0/+0
| * | | | | | | | | | | | | Doc: Added missing examples and snippets.David Boddie2010-10-0656-0/+3732
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2571-94/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-2571-94/+94
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-256-79/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-256-79/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-132-79/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-10-121-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Rename .pro file to match directory name.Jason McDonald2010-10-121-0/+0
| * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-124-16/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |