summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-292-2/+3
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-272-2/+3
| |\
| | * Fix bug in QML debug client installationAaron Kennedy2010-10-271-1/+1
| | * Doc clarification for Loader.Michael Brasser2010-10-271-1/+2
| |/
* | Doc: Fixed basic language.David Boddie2010-10-291-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-27120-392/+824
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-262-4/+4
| |\
| | * Set the location of the closing brace.Roberto Raggi2010-10-262-4/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-268-10/+72
| |\ \
| | * | Phonon MMF backend: set _q_DummyWindowSurface property on VideoWidgetGareth Stockwell2010-10-261-0/+2
| | * | Create dummy window surface if if _q_DummyWindowSurface property is setGareth Stockwell2010-10-261-4/+16
| | * | Remove widget subtree from backing store tracker when reparentedGareth Stockwell2010-10-263-3/+42
| | * | Suppress call to controlVisibilityChanged for null control pointerGareth Stockwell2010-10-261-1/+2
| | * | Fix patch_capabilities.pl script for explicit set of capabilitiesMiikka Heikkinen2010-10-261-0/+3
| | * | Fix empty mifconv TARGETFILE in some edge cases.Miikka Heikkinen2010-10-262-2/+7
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-268-8/+8
| |\ \ | | |/ | |/|
| | * Doc : Fixing typo.Sergio Ahumada2010-10-268-8/+8
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-261-1/+20
| |\ \ | | |/ | |/|
| | * Remove qdrawhelper_arm_simd.cpp dependency to u32std.hJani Hautakangas2010-10-261-1/+20
| * | 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' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-264-49/+46
| |\ \
| | * | Phonon MMF backend: removed redundant trace outputGareth Stockwell2010-10-251-14/+0
| | * | qmediaplayer: added command-line switch for initial volumeGareth Stockwell2010-10-253-35/+46
| * | | 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' 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
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
| | |/ / / / / /
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-113-0/+14
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-10-103-0/+14
| | | |\ \ \ \ \ \ | | |/ / / / / / /
| | | * | | | | | Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-10-101-1/+1
| | |\ \ \ \ \ \ \