summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc clarification for Loader.Michael Brasser2010-10-271-1/+2
* 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-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