summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'feature' into 4.6Jørgen Lind2009-11-061-2/+2
| |\ \ \
| | * | | Fix QT_NO_SHORTCUTJørgen Lind2009-11-061-2/+2
| | |/ / | | | | | | | | | | | | Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | Merge branch '4.6-s60' into 4.6axis2009-11-062-5/+10
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-051-0/+61
| | |\ \
| * | | | Add preliminary QAccessibleImage interfaceHarald Fernengel2009-11-062-1/+44
| | |_|/ | |/| | | | | | | | | | As requested by the Maemo team.
| * | | Support composition mode source for drawing in dfbAnders Bakken2009-11-061-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt's/DirectFB's composition modes are not compatible for drawing operations. We only support SourceOver and handle whether or not to blend colors using DSDRAW_BLEND based on the alpha/opacity value. If drawing with Source and an opaque color we can still handle the operation using DirectFB. This has major impact since WebKit fills the background of web pages using Source. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | Reset composition mode after drawing in dfbAnders Bakken2009-11-061-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When drawing primitives in DirectFB we always set composition mode to NONE and manually manage whether or not to blend. This patch makes sure we will reset the composition mode afterwards. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | Fix bad merge from 4.5 in powervr codeRhys Weatherley2009-11-061-61/+0
| | |/ | |/|
| * | Merge branch '4.5' into 4.6Morten Johan Sørvig2009-11-051-0/+61
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qsqlquery/tst_qsqlquery.cpp tests/auto/qtextlayout/tst_qtextlayout.cpp
| | * | Increase PowerVR memory alignment from 8 to 32 for SGX systems.Rhys Weatherley2009-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Increasing the alignment does not seem to affect MBX. Back port of 7997279bc22d30bf1d1a30a567bda33ecc9aeb2d
| | * | The shipped pvr2d.h/wsegl.h for PowerVR do not work with MBXRhys Weatherley2009-11-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme Back port of 4ae09215de36fcfd17dc6875aca102d784d65012
| | * | Remove unnecessary PowerVR helper functionsRhys Weatherley2009-11-012-75/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cross-process memory sharing code never really worked in the way we needed it to - so remove it until something better comes along. Reviewed-by: trustme Back port of 04648b44f0784223122a782320d0b09b5c1e9497
| | * | Make screen rotation work properly with the PowerVR screen driverRhys Weatherley2009-11-019-9/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2261 Reviewed-by: Tom Back port of 75719e4e06882825fe056935d782b4153bf0ac5b
| | * | Remove the surface holder from the PowerVR screen driverRhys Weatherley2009-10-154-148/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PvrEglSurfaceHolder is a hold-over from Qtopia that isn't needed any more and was never very stable anyway. Reviewed-by: trustme Back port of f613b0170d0fe806378779472315d0bbdc1aada9
| | * | Back port fixes from PowerVR driver in 4.6 to 4.5Rhys Weatherley2009-10-093-9/+16
| | | | | | | | | | | | | | | | | | | | Pre-multiply fix: 01a671ff0bd380e5cff311cc233352c867a041a0 Painting performance: c3cfba7295c990d8135e1dd70b8cdbefd25615ab
| | * | Bump version number of 4.5 branch to 4.5.4.Jason McDonald2009-10-051-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fix support for 32-bit PowerVR screens with QGraphicsViewRhys Weatherley2009-10-021-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QGLWidget was used as a viewport for QGraphicsView, it was still treating the window surface as RGB16. Use the screen's actual pixel format. Also ensure that PvrEglWindowSurface::image() returns a non-null QImage if the drawable hasn't been created yet. Reviewed-by: trustme Back port of 53b3a0572242d0a425e74848afba1293f195d29b
* | | | Implemented aspect ratio and scale mode handling in Phonon MMF backendGareth Stockwell2009-11-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaced VolumeObserver and VideoOutputObserver interfaces with signals. - Added signals for propagating changes in aspect ratio and scale mode from VideoOutput to VideoPlayer. - Removed VideoPlayer::getNativeWindowSystemHandles. Interaction with window system is moved into VideoOutput, so that VideoPlayer is better focussed on its main task: interacting with CVideoPlayerUtility. - WId changes, resize and move events received by the VideoOutput widget cause it to emit a videoWindowChanged signal. This is received by the VideoPlayer, which triggers a call to updateVideoRect. The main task of this function is to calculate the scale factors which are provided to the MMF via CVideoPlayerUtility::SetScaleFactorL. Note that: i) This function must be called both before and after the call to SetDisplayWindowL. For changes in aspect ratio or scale mode, setting the scale mode after updating the display window is sufficient. However, testing showed that, when switching in or out of full-screen mode, two calls were necessary in order to preserve the correct aspect ratio. ii) The screen rectangle passed to the MMF is still the full window extent; it is not the region in which video will actually be rendered. The post-processor will fill in the remainder of the window with a background colour (typically black). If, on the other hand, we passed in the actual video display rectangle, we would need to do this background painting in the widget. This in turn would require a change to QtGui: at present, we can only disable blitting on a per-widget basis (by setting QWExtra::disableBlit). If we needed to paint the borders of the video window, disableBlit would need to contain the actual DSA region, rather than just a single boolean flag. Task-number: QTBUG-5585 Reviewed-by: Frans Englich
* | | | Replace mmfphonondebug.lib with #ifndef QT_NO_DEBUG.Frans Englich2009-11-093-125/+100
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The debug{} directive in src/plugins/phonon/mmf/plugin/plugin.pro does not have any effect - this can be seen by looking at the generated MMP file, which has a STATICLIBRARY directive which is applied in both UDEB and UREL builds. This is the general problem that .pro files cannot tell distinction between the different targets that one makespec covers. Also remove objectdumpstub; objectdump was originally prepared for QtGui inclusion, but since that never happened, no other platforms than Symbian needs to be covered. Task-number: QTBUG-5466 Reviewed-by: Gareth Stockwell
* | | Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-041-0/+2
|\ \ \
| * | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-041-0/+2
| |/ / | | | | | | | | | | | | | | | Also added symbianpkgrules.pri include to some examples Reviewed-by: Janne Koskinen
* | | Implemented metadata handling in Phonon MMF backendGareth Stockwell2009-11-041-5/+6
| | | | | | | | | | | | | | | Task-number: QTBUG-4662 Reviewed-by: Frans Englich
* | | Merge branch '4.6' into mmfphononGareth Stockwell2009-11-036-11/+111
|\ \ \ | |/ /
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-034-4/+16
| |\ \
| | * \ Merge commit 'origin/4.6' into featureJørgen Lind2009-11-022-6/+92
| | |\ \
| | | * | Compilation failure for OpenGL and OpenVG graphic system plugins whenKeith Isdale2009-11-021-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opengl ES is used on Qt for Windows CE Simplify logic as OpenGL graphic system is not supported for WindowsCE Task-number: QTBUG-5080 Reviewed-by: Rhys Weatherley
| | | * | Compilation failure for OpenGL and OpenVG graphic system plugins whenKeith Isdale2009-11-021-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opengl ES is used on Qt for Windows CE For WindowsCE plugins do not support version 1.x of OpenGL ES Task-number : QTBUG-5080 Reviewed-by : Trond Kjernåsen
| | * | | Fix LIBRARY and ICONJørgen Lind2009-10-293-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However, compiling with QT_NO_ICON will still not work :( Reviewed-by: tom
| | * | | Fixed MENU and QWS_PROXYSCREENJørgen Lind2009-10-292-2/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| * | | | Re-added checking for existence of sqlite3 binaries to Symbian buildsMiikka Heikkinen2009-11-021-2/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always adding export for sqlite3 binaries will cause cleanup of platform provided versions on platforms that provide them. Fixed by adding check for existence of sqlite3.dso before adding the export statement to bld.inf. Task-number: QT-2419 Reviewed-by: Janne Koskinen
| * | | Fix QDateTime on S60 3.1Shane Kearns2009-10-291-5/+91
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60 3.1 plugin returned empty strings for the unsupported APIs Since these APIs are needed for the most common use case of converting a QDateTime to a QString using the local format, I have implemented an emulation of the missing APIs using older APIs that are supported. Updated the autotest so it does some sanity checking on the result of local date/time conversion - it would pass instead of fail if the string was garbage before. Reviewed-by: Aleksandar Sasha Babic
* | | Video screen region is updated in response to ancestors of video widgetGareth Stockwell2009-10-231-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being moved. Because QWidget::moveEvent is only called when a widget moves relative to its parent, a widget's absolute screen position may change without it receiving a moveEvent (for example, as a result of its parent being moved). The MMF video playback API on Symbian v9.4 requires, in addition to a window handle, an absolute screen rectangle. Changes in the video widget's absolute screen position therefore need to be propagated into the MMF. This change introduces a new object, AncestorMoveMonitor, which installs an event filter on the QCoreApplication instance. A VideoOutput object registers with the AncestorMoveMonitor, which listens on its behalf for MoveEvents and ParentChangeEvents directed at any of the ancestors of the VideoOutput. MoveEvents trigger a callback to the VideoOutput instance, which then notifies the MMF of the new screen rectangle. ParentChangeEvents cause the AncestorMoveMonitor to update the ancestor list associated with the target VideoOutput instance. The video position now tracks that of the associated widget, but there are two problems which require further investigation: 1. The video window lags behind. This may be an unavoidable consequence of the fact that setting a new screen rectangle causes the MMF to tear down its DSA session and start a new one; this is known to block the window server and take some time to complete. 2. Artifacts are visible around the edges of the moving video widget. Task-number: QTBUG-4787 Reviewed-by: Frans Englich
* | Store DirectFB winID as a dynamic propertyAnders Bakken2009-10-221-0/+13
| | | | | | | | | | | | | | | | | | | | Since QWS uses the winids for its own purposes I have to store this as a dynamic property. _q_DirectFBWindowID The _q_ is documented to be reserved so this won't break anyone's applications. Reviewed-by: Donald Carr <donald.carr@nokia.com>
generated by cgit v0.12 at 2024-12-12 08:18:47 (GMT)