summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-282-3/+29
|\
| * Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-222-3/+29
| | | | | | | | | | | | This is a very operation in DirectFB and saves a fair bit of overhead. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Fix a regression: icons with slightly wrong ICO header did not load.Jan-Arve Sæther2010-01-281-0/+4
|/ | | | | | | | | | Regression was introduced by commit fd9cdaa55da455b90eacec571aeb2c84fa55f7e0. Also fix a completely broken autotest that didn't actually test anything. Task-number: QTBUG-7688 Reviewed-by: Alexis
* Fix semitransparent windows with DirectFBAnders Bakken2010-01-211-3/+0
| | | | | | This filling of the window surface is a bug. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* Bump version to 4.6.2.Jason McDonald2010-01-191-1/+1
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-121-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added absolute path to sqlite3.sis in s60installs.pro Added changelog entries. Added enable/disable parameter to each effect in Phonon MMF backend Simplified error handling for audio effects Implemented stereo widening effect in Phonon MMF backend Implemented reverb effect in Phonon MMF backend Implemented loudness effect in Phonon MMF backend Implemented bass boost in Phonon MMF backend Refactored AbstractAudioEffect to reduce redundancy in derived classes Removed unnecessary check in Phonon MMF backend Added a macro to reduce boilerplate code in Phonon MMF backend Removed dependency of EffectFactory on native effect headers Delayed creation of audio effect object until audio is initialized Modified effect parameter handling to improve user experience Added comments to clarify usage of Phonon::EffectParameter API Shortened description of audio equalizer bands Implemented audio effects capability querying in Phonon MMF backend Corrected parameter name ordering in internal Phonon MMF function signatures Fixed typo in Phonon::EffectWidget implementation
| * Merge commit 'origin/mmfphonon' into 4.6Gareth Stockwell2010-01-121-0/+9
| |\
| | * Implemented stereo widening effect in Phonon MMF backendGareth Stockwell2010-01-111-0/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| | * Implemented reverb effect in Phonon MMF backendGareth Stockwell2010-01-111-0/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| | * Implemented loudness effect in Phonon MMF backendGareth Stockwell2010-01-111-0/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| | * Modified effect parameter handling to improve user experienceGareth Stockwell2010-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is to work around a limitation in the Phonon::EffectWidget class. This widget only displays sliders for parameters with numeric values if the variant type of the parameter is QReal and the range is exactly -1.0 to +1.0; otherwise, a spinbox is displayed. This is rather inconvenient for many effects, such as the audio equalizer, for which a slider is a much more natural UI control. The MMF backend therefore reports the type of numeric parameters to be QReal, and the range to be -1.0 to +1.0. Internally, the integer range for the parameter is stored. Changes to the parameter value are converted from the client-side, floating point representation to the internal, integer representation. Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
| | * Implemented audio effects capability querying in Phonon MMF backendGareth Stockwell2010-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch addresses the following deficiencies in the existing implementation of audio effects: 1. Native effect objects (e.g. CAudioEqualizer, CBassBoost etc) were created frequently, just in order to check whether a given effect is supported, or retrieve the list of parameters which it requires. Although this is in part due to a deficiency in the S60 audio effects API (it doesn't have a 'capability query' concept), it can be improved by using caching. This patch introduces a singleton EffectFactory object, which lazily initializes a data structure containing information about support and parameters. 2. In order to either query effect support, the native effect object ultimately needs to access a DevSound instance. Previously, the effect object was provided with a CMdaAudioPlayerUtility object. If this player utility has not loaded an MMF controller plugin *before* the effects object makes any calls to the player utility, incorrect results will be returned. This was observed in the previous code. For querying, we don't actually need to load an MMF controller; instead, we would like to directly provide a CMMFDevSound instance to the effect object. Unfortunately, this API is not available in public S60 SDKs, so we must use the next lowest interface available, namely CMdaAudioOutputStream. By making this change, this patch ensures that support and parameter queries made via the EffectFactory will return the correct result. At this point, however, effect settings made via the Phonon API are not actually applied to the audio output. Fixing this will require notifying the audio effects backend nodes of state changes in the MediaObject. Task-number: QTBUG-4659 Reviewed-by: Espen Riskedal
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-07134-134/+134
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| * | Update copyright year to 2010Jason McDonald2010-01-06134-134/+134
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | BitsPerSample should default to 1 in TIFF files.Rhys Weatherley2010-01-041-4/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-6870 Reviewed-by: Lorn Potter
* | | Make stretchblit an opt-out option in DirectFBAnders Bakken2010-01-042-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | Certain boards are not support StretchBlit very well. This patch enables them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster engine for stretchblits. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | | Set serial number in QDFBPixmapData::transformedAnders Bakken2010-01-041-0/+1
|/ / | | | | | | | | | | | | QDirectFBPixmapData::transformed initializes a new QDirectFBPixmapData object but doesn't set its serial number. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-252-16/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| * | Read QWS_SIZE from layer rather than screenAnders Bakken2009-12-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running the X11 emulator of DirectFB IDirectFBScreen->GetSize returns the size of the entire X11 Display, not the actual DirectFB window. We can read this from the primary layer instead and this value is correct both on devices and on the desktop. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Get rid of no_cast_from_ascii warningAnders Bakken2009-12-231-1/+1
| | |
| * | gif: 10% speedup on microbenchmark on QImageReaderHolger Hans Peter Freyther2009-12-231-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the microbenchmark of what is executed during pure pageloading in regarding to QImageReader this is an improvement. Do not use the non const QImage::scanLine as this will go through the QImage::detach all the time making QImage::scanLine show up in the profile. Introduce a FAST_SCAN_LINE that is doing the scanLine calculation on local variables. Reviewed-by: Andreas
* | | Changed autodetection logic for stlport version and sqlite in SymbianMiikka Heikkinen2009-12-231-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | To support building Qt as part of Symbian SDK where epoc32 is not yet populated, changed the autodetection logic in determining stlport version. Now, we assume that we want the new version, unless only the old version exists on SDK already. Sqlite binaries export autodetection is now skipped if CONFIG value symbian_no_export_sqlite exists, allowing clean builds to explicitly suppress exporting. Task-number: QTBUG-6971 Reviewed-by: axis
* | Implement ScaledClipRect in the jpeg image pluginRhys Weatherley2009-12-232-9/+47
| | | | | | | | | | | | | | | | | | Where possible, we convert the post-scale clip rectangle into a pre-scale clip rectangle because it is more efficient to clip first. Task-number: QT-2023 Reviewed-by: Sarah Smith Reviewed-by: Daniel Pope
* | Add support for ClipRect to the jpeg image pluginRhys Weatherley2009-12-232-86/+149
| | | | | | | | | | | | | | | | | | | | | | The jpeg is read and scanlines discarded until the clip region is found (libjpeg doesn't support direct seeking). This is faster than the previous approach of reading the entire jpeg and then clipping. Task-number: QT-2023 Reviewed-by: Sarah Smith Reviewed-by: Daniel Pope
* | Use libjpeg's builtin scaler for implementing setScaledSize()Rhys Weatherley2009-12-221-3/+2
| | | | | | | | | | | | | | | | | | | | The libjpeg library has builtin support for scaling to 1/2, 1/4, and 1/8 the original size very quickly. Use this in the implementation of setScaledSize() to get close to the desired size and then scale with QImageSmoothScaler the rest of the way. Task-number: QT-2023 Reviewed-by: Daniel Pope
* | Remove unused legacy code from the jpeg image pluginRhys Weatherley2009-12-222-134/+11
| | | | | | | | | | | | | | | | | | | | | | A long time ago, in a Qt version far, far, away there was a parameter string mechanism for asking for header details, requesting scaling, and so on. This has since been replaced with actual real API's and it is no longer possible to pass such parameter strings to the image plugins. This change removes the crufty beloved old code. Reviewed-by: Sarah Smith
* | Clean up debug message with DirectFBAnders Bakken2009-12-091-29/+29
| | | | | | | | | | | | Remove some superfluous spaces. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Enable customizing of DirectFB layer to useAnders Bakken2009-12-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | This patch enables you to use a different layer for Qt apps by specifying: E.g. QWS_DISPLAY=directfb:layerid=2 Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | Set stacking class for stays-on-top windows in DFBAnders Bakken2009-12-091-1/+3
| | | | | | | | | | | | | | | | For better compatibility with non-QWS DirectFB apps running in the same session we should set the stacking class of Windows that have the StaysOnTop flag set. This corresponds nicely to DWSC_UPPER. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
* | Unnecessary symbian version checks in sqldrivers.proJouni Hiltunen2009-12-031-3/+1
| | | | | | | | | | | | | | | | | | | | Version checks in sqldrivers.pro are not needed. These version checks also fail if symbian version does not match to 3.1 3.2 or 5.0. The included sqlite_symbian.pro checks if the binaries are already present or not. Reviewed-By: Shane Kearns
* | Bump version to 4.6.1Jason McDonald2009-12-011-1/+1
|/ | | | Reviewed-by: Trust Me
* Fix configure warning for non-symbian buildsJason McDonald2009-11-231-2/+4
| | | | | | | | Configure complains about "Could not retrieve HKEY_LOCAL_MACHINE\Software\Symbian\EPOC SDKs setting". It should only try to do that for Symbian builds. Reviewed-by: Lincoln Ramsay
* Fix for compile error in Phonon MMF backendGareth Stockwell2009-11-191-4/+2
| | | | | | | | | | | | | | | | This was introduced by d0b0b525de. The use of QT_NO_DEBUG macros causes release-armv5 builds to fail when the -release option is passed to configure. This change causes the debugging code (ObjectDump and related classes) to be included in release builds, although these functions are not executed. This is a temporary fix; task QTBUG-6012 has been created for re-removing this code from release builds. Reviewed-by: Frans Englich
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-191-2/+2
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-181-2/+2
| | | | | | | | Over src/ tools/ examples/ and demos/
* | Complement Phonon for Symbian documentation.Frans Englich2009-11-181-0/+4
| | | | | | | | Reviewed-by: Gareth Stockwell
* | Remove DWCAPS_DOUBLEBUFFER in window creationAnders Bakken2009-11-181-1/+1
|/ | | | | | | | This value seems to cause problems on various chipsets and we get a double buffered window regardless. Reviewed-by: Donald Carr <donald.carr@nokia.com> (cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
* Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-1610-307/+355
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-1311-26/+74
| |\ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-098-18/+18
| | |\
| | | * API review: Rename numRects() -> rectCount()Marius Storm-Olsen2009-11-093-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegion::numRects() is marked obsolete. Removed all usage of the old function inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | | * API review: Rename numDigits() and setNumDigits()Marius Storm-Olsen2009-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QLCDNumber doesn't follow the API convention of *Count and set*Count(). Introduce properly named functions, and obsolete the old ones. Reviewed-by: Andreas Aardal Hanssen
| | | * API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-065-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | | * API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-092-289/+336
| |\ \ \
| | * | | Fixed bug where JPEG scaling resulted in an uninitialised pixel column.Kim Motoyoshi Kalland2009-11-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading a JPEG image after calling QImageReader::setScaledSize() could cause a 1 pixel wide column of uninitialised pixels at the far right of the image. The bug was caused by rounding in the scaling algorithm. Fixed by copying the last calculated pixel all the way to the end of the row. Task-number: QTBUG-3282 Reviewed-by: Trond
| | * | | Replaced tabs with spaces in scale() in qjpeghandler.cpp.Kim Motoyoshi Kalland2009-11-091-229/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced tabs with spaces and Qt-ified code formatting in QImageSmoothScaler::scale(). Reviewed-by: Trond
| | * | | Fixed loading of 8-bit grayscale TIFF files.Samuel Rødal2009-11-091-60/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PHOTOMETRIC_MINISBLACK and PHOTOMETRIC_MINISWHITE settings also apply to 8-bit grayscale, so we need to check the bit depth of the image as well. For convenience we also try to write the images using PHOTOMETRIC_MINISBLACK and PHOTOMETRIC_MINISWHITE as opposed to PHOTOMETRIC_PALETTE when we detect that the color table is grayscale. Task-number: QTBUG-5459 Reviewed-by: Benjamin Poulain
| * | | | Fixed up qttracereplay and trace graphicsystem a bit.Gunnar Sletta2009-11-091-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added "qttrace" to binary file, making it possible to do a sanity verification of the input file in qttracereplay - Sanity check input binary file, both for existance and for content in qttracereplay - Console app on windows and mac - Added helpful output for -h and --help command line options Reviewed-by: Samuel
* | | | Merge branch '4.6' into mmfphononFrans Englich2009-11-163-25/+106
|\ \ \ \ | | |/ / | |/| |