summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed state bug in Phonon MMF backendGareth Stockwell2009-11-031-3/+3
| | | | | | | | | | | | This fixes a bug introduced by 58efa8aa, which meant that, when a new clip was opened: 1. Playback did not start automatically 2. The current volume setting in the app UI was not applied to the MMF client API Task-number: QTBUG-4999 Reviewed-by: trustme
* Fix for unresponsive sliders after orientation switch or full-screenGareth Stockwell2009-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | video playback During the switch to full-screen video playback, the following happens: 1. Double-tapping to enable full-screen results in a call to QSymbianControl::HandleLongTapL 2. This modifies the global variable QApplication::mouse_buttons, OR'ing in Qt::RightButton 3. QWidgetPrivate::create_sys, called as a result of the call to setWindowFlags made by Phonon::VideoWIdget::setFullScreen, schedules a delayed deletion of the same control as in step (1) above 4. The control gets deleted before it receives a HandlePointerEventL for the long tap release, which would have removed Qt::RightButton from the mouse_button bitmask 5. In subsequent calls to QSlider::mousePressEvent, the test (ev->buttons() ^ ev->button()) is false, which results in the event being ignored. Ideally, we would fix this by propagating the m_previousEventLongPress flag from the deleted QSymbianControl to the newly created one. However, this does not work because the new control does not receive the HandlePointerEventL callback for the long press release. We therefore fix the bug by checking for m_previousEventLondPress in the QSymbianControl destructor; if it is set, we clear the Qt::RightButton bit from the QApplication::mouse_buttons mask. Note that QTBUG-5309 (Cannot interact with sliders after orientation switch during audio playback) is still seen after applying this patch. Task-number: QTBUG-5242, QTBUG-5308 Reviewed-by: axis
* Fix build caused by merge error.Frans Englich2009-10-231-1/+0
|
* Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Frans Englich2009-10-230-0/+0
|\ | | | | | | mmfphonon
| * Video screen region is updated in response to ancestors of video widgetGareth Stockwell2009-10-229-11/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * When creating a Symbian WId for a visible widget, make the controlGareth Stockwell2009-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | visible after activating the window. This change was required in order to be able to run the test case for the below task; however, it is more generally required. Without it, the contents of the descendents of this widget will not be visible, until they are explicitly hidden and then re-shown. Task-number: QTBUG-4787 Reviewed-by: axis
* | Improve error handling.Frans Englich2009-10-237-51/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | Errors reported via: * the DummyPlayer didn't work due to it not doing the usual state transitions/emission * MediaObject::setSource() due to errors being emitted before connections being set up. * A general state bug. Task-number: QTBUG-4752 Reviewed-by: Gareth Stockwell
* | Fixed softkey autotest build after 5370e5ff.Janne Anttila2009-10-231-7/+18
| | | | | | | | Reviewed-by: axis
* | Video screen region is updated in response to ancestors of video widgetGareth Stockwell2009-10-239-11/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | When creating a Symbian WId for a visible widget, make the controlGareth Stockwell2009-10-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | visible after activating the window. This change was required in order to be able to run the test case for the below task; however, it is more generally required. Without it, the contents of the descendents of this widget will not be visible, until they are explicitly hidden and then re-shown. Task-number: QTBUG-4787 Reviewed-by: axis
* | Listen to hasVideoChanged() signal instead, such that we're more robust.Frans Englich2009-10-231-0/+1
| | | | | | | | | | | | | | | | This covers cases where the backend knows about video capability in a state other than the LoadingState. Patch by Adookkattil Saleem, slightly modified. Reviewed-by: Gareth Stockwell
* | Softkeys should not put exit by default on RSK for dialogs and popups.Janne Anttila2009-10-231-1/+2
| | | | | | | | | | | | | | | | The idea is that softkeys and pop-ups need to take care of setting all softkeys by themselves. Task-number: QTBUG-4916 Reviewed-by: Jason Barron
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-231326-12049/+35540
|\ \
| * | Fix bad check for GCC version.Thiago Macieira2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | These macros are available since GCC 2.95. Reviewed-by: Olivier Goffart
| * | fix line endingOswald Buddenhagen2009-10-231-1/+1
| | |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-231440-15891/+42346
| |\ \
| | * | Better sql unicode tests (still not working correctly tho).Bill King2009-10-232-11/+9
| | | |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-221464-16003/+43818
| | |\ \
| | | * | 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>
| | | * | Compile fix for gestures on Windows.Denis Dzyubenko2009-10-221-4/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be overwritten when the final patch of this bug hits trunk: https://bugs.webkit.org/show_bug.cgi?id=30671 Patch-by: Janne Koskinen Reviewed-by: Jocelyn Turcotte
| | | * | Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be overwritten when the final patch of this bug hits trunk: https://bugs.webkit.org/show_bug.cgi?id=30670 Patch-by: Janne Koskinen Reviewed-by: Jocelyn Turcotte
| | | * | Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin SmithMartin Smith2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | doc: Changed Trolltech to Nokia
| | | * | Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by IainIain2009-10-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary workaround to get WebKit to pick up DEF file from std location Tweak WebCore .pro file to get its DEF file from the same location as all the other DEF files come from Reviewed-by: TrustMe
| | | * | Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn TurcotteJocelyn Turcotte2009-10-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39 by Simon Hausmann Fix crash of QtScript on Mac OS X When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen
| | | * | Updated WebKit from /home/jturcott/dev/webkit/ to ↵Jocelyn Turcotte2009-10-221270-11675/+33732
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtwebkit-4.6-snapshot-22102009 ( 0639bb8e812c8923287cd5523248ca64fa5f7a50 ) Changes in WebKit/qt since the last update: Jocelyn: fatal error from script, sha1 in src/3rdparty/webkit/VERSION is bad
| | | * | Update mkdist-webkit script with latest tag.Jocelyn Turcotte2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | Not-reviewed: No-big-deal
| | | * | Remove declaration of QDirectFBScreen::scrollAnders Bakken2009-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function has been declared since the initial commit but was never actually implemented. The function exists in QDirectFBWindowSurface. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | * | Compile fix.Denis Dzyubenko2009-10-226-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPanGesture was changed to use QPointF instead of QSizeF, also need to change all usages of the pan gesture. Reviewed-by: trustme
| | | * | QTextEdit: Fix the wrong order for call of Qt::WA_InputMethodEnabled in ↵Liang QI2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setReadOnly. Should set Qt::WA_InputMethodEnabled after set the flags, just because shouldEnableInputMethod() will read the flags. Task-number: QTBUG-4917 Reviewed-by: Shane Kearns
| | | * | QHttp: Fix bug related to SSL and big POST dataMarkus Goetz2009-10-223-7/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHttp is deprecated, but let's be nice and fix this. POST/PUT now properly works over HTTPS without buffering the whole data when it is not needed. Reviewed-by: Peter Hartmann
| | | * | QSslSocket: Trigger a SSL transmission when reading from the socket.Markus Goetz2009-10-224-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases a SSL transfer stalled when a readBufferSize was set. This change triggers a SSL transmission when there is data on the socket waiting to be decrypted. Task-number: QTBUG-3860 Reviewed-by: Thiago
| | | * | Make warning more helpful.Thomas Zander2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | Also fix grammer and avoid using combined words.
| | | * | Change API; the pan gesture now has points for distance, not size.Thomas Zander2009-10-224-24/+24
| | | | |
| | | * | Make the already-public calls be documented and publicThomas Zander2009-10-222-3/+2
| | | | |
| | | * | Fixed the gestures/graphicsview manualtestDenis Dzyubenko2009-10-222-4/+23
| | | | |
| | | * | Implemented gesture event delivery and propagation inside QGraphicsView.Denis Dzyubenko2009-10-223-38/+350
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thomas Zander
| | | * | Added debug operator for QGraphicsObjectDenis Dzyubenko2009-10-222-0/+18
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Alexis Menard
| | | * | Add QGestureEvent::mapToScene for better graphicsView integrationThomas Zander2009-10-224-0/+50
| | | | |
| | | * | Fix for the gestures autotest.Denis Dzyubenko2009-10-222-9/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | Improvements for gesture event deliveryDenis Dzyubenko2009-10-227-42/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When delivering GestureOverride events by default both the event and individual gestures will be ignored. We also store the acceptance state of individual gesture in the event and not in the gesture object, along with its target. Reviewed-by: Thomas Zander
| | | * | Improving gesture event delivery for widgets.Denis Dzyubenko2009-10-225-89/+324
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | Fixed gesture event delivery when several gestures are triggered.Denis Dzyubenko2009-10-223-29/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are two different gestures are being triggered and they are supposed to be sent to different widgets, don't stop event "propagation" when the first event is successfully delivered. Reviewed-by: trustme
| | | * | Improved gesture event filtering inside QGraphicsView for QGraphicObjectsDenis Dzyubenko2009-10-2213-185/+372
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | Extended an autotest for gestures.Denis Dzyubenko2009-10-221-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that when a gesture recognizer explicitely sets the targetObject to a QGraphicsObject, we deliver it only to the object and will not try to propagate. Reviewed-by: trustme
| | | * | Changed qsrand() behavior for Windows to match the linux versionninerider2009-10-221-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A problem occurred related to the createUUid function on Windows Mobile. Calling rand() before srand() resulted in identical pseudo random sequences for different threads. Reviewed-by: Joerg
| | | * | Description: Auto test fixes for Windows Mobile platformninerider2009-10-221-5/+43
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Joerg
| | * | | Update audio unit tests with clock() range checking.Kurt Korbatits2009-10-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Check to make sure clock() return is in microseconds. Reviewed-by:Justin McPherson
| * | | | Added caching of graphics effect source pixmaps to speed up effects.Samuel Rødal2009-10-229-13/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an effect is applied repeatedly on the same source, just with varying parameters, we can save a lot by caching the source pixmaps. Reviewed-by: Bjørn Erik Nilsen
| * | | | Remove whitespace before license header in qbackingstore_p.hEskil Abrahamsen Blomfeldt2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extra whitespace was introduced by mistake in a previous commit. Remove it again. Reviewed-by: Trust me