summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-264-49/+46
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF backend: removed redundant trace output qmediaplayer: added command-line switch for initial volume
| * 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
| | | | | | | | | | | | Initial volume can be set using the following switch: -volume <level> where 0.0 <= level <= 1.0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2514-114/+405
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Simplify calculation of center point and scale for PinchRecongizer Doc: Fixing typo QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| * | Simplify calculation of center point and scale for PinchRecongizerFrederik Gladhorn2010-10-251-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | Constructing a QLineF to get at the centerPoint is not precise and can be done simpler. The scale factor can be assigned directly to d->scaleFactor instead of creating a temporary scaleFactor variable. Reviewed-by: Zeno Albisser
| * | Doc: Fixing typoSergio Ahumada2010-10-255-10/+10
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2411-101/+395
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2311-101/+395
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-2211-101/+395
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QtDFB: Make transparent windows behave better For meego graphics system, use floyd-steinberg dithering when converting to 16bit. Added support for blitting to native child widgets in GL window surface.
| | | | * | QtDFB: Make transparent windows behave betterAnders Bakken2010-10-223-17/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows with Qt::WA_NoSystemBackground should clear to transparent in beginPaint. Merge-request: 882 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | For meego graphics system, use floyd-steinberg dithering when converting to ↵Michael Dominic K2010-10-223-24/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16bit. Merge-request: 2496 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | | * | Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-225-60/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support blitting by copying from the top-level window's back buffer to a temporary texture and then blitting from the texture to the native child widget. Performance suffers, but it's better than failing. Reviewed-by: Gunnar Sletta
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-251-0/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add autotest for QString::setRawData()
| * | | | | | add autotest for QString::setRawData()Oswald Buddenhagen2010-10-251-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and improve the one for fromRawData() marginally Reviewed-by: olivier
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-2597-551/+4338
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| * \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14484 Reviewed-by: Marius Storm-Olsen
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This undoes change 43e6ec9f01693044f7bc1. This enum value is internal and not generally supported by Qt. Reviewed-by: Olivier Goffart
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errors and omissions will be fixed in later commits. The idea here is to merge the compiler notes into the platform notes because the platform is usually fixed and the compiler is often determined by the platform. In addition, notes about compilers are not always applicable to multiple platforms, so collating notes by compiler does not save much space, and it only makes maintenance of the notes more difficult.
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12071
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to change 96226ad15202770f72e257d1a75654be9582326c.
| * | | | | | | | | | | | | Doc: Fixed warnings caused by an earlier change. Made docs consistent.David Boddie2010-10-074-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to change f447ae026637a75d565e9347eb19f33d09557039.
| * | | | | | | | | | | | | Doc: Fixed warnings caused by an earlier change. Made docs consistent.David Boddie2010-10-079-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change b65a598e0c580585bd16babfd46967b0f4cf8931 broke some links.
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14238
| * | | | | | | | | | | | | | Doc: Added missing examples and snippets.David Boddie2010-10-0656-0/+3732
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14238
* | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-2571-94/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed many spelling errors.
| * | | | | | | | | | | | | | 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 ↵Qt Continuous Integration System2010-10-256-79/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Demo Spectrum wav data size is not calculated correctly Revert "Don't define highp/mediump/lowp if desktop GL has them" Rename .pro file to match directory name. Doc: Fixed qdoc warning. Add header guards to audio example headers.
| * | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-256-79/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qcryptographichash.cpp src/opengl/qgl_p.h
| * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-132-79/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Demo Spectrum wav data size is not calculated correctly
| | * | | | | | | | | | | | | Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Grab length of audio data from Data chunk size - Read from the device no greater than the audio Data chunk size Task-number: QTBUG-13779 Reviewed-by: Andrew den Exter
generated by cgit v0.12 at 2025-02-11 16:22:36 (GMT)