| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Modified the sequence of calls made to the MMF APIs when seeking
during ongoing playback. This fixes a bug found during early testing
of streaming playback, whereby playback would not resume following
the seeking operation. This was due to an interaction between the
pause / seek / play operations, and the buffering callbacks received
from the MMF, which caused the backend to enter an incorrect state.
Task-number: QTBUG-4660
Reviewed-by: Frans Englich
(cherry picked from commit 66b765734585971dd9d248059701fdecebbccd78)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When clips are buffering (either at the start of playback, or
during playback, when buffer levels drop due to e.g. CPU, file system
or network load), the backend receives notification from the MMF.
While buffering is ongoing, the backend periodically queries the
filling status and emits a signal.
Task-number: QTBUG-4660
Reviewed-by: Frans Englich
(cherry picked from commit bed33ac62d87073120d56ff75a3d2356c99c64ea)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Because the MIME type of the stream cannot always be deduced from the
URL, we assume that it is a video stream. This is based on the
assumption that the video controllers will be capable of parsing
the container formats for audio-only, as well as video clips. Note
that this assumption may not hold on all devices.
Note that most implementations of the MMF client APIs do not support
HTTP streaming (a.k.a. progressive download). The backend has therefore
only been tested with RTSP streams - see the JIRA entry for further
details.
Task-number: QTBUG-4660
Reviewed-by: Frans Englich
(cherry picked from commit 3117e3a6a9c1bf95fc30ebee4d8d11b646cb7125)
|
|
|
|
|
| |
Reviewed-by: Frans Englich
(cherry picked from commit bbab8eabb91b95dcd946c94b5f0ac59413e7a929)
|
|
|
|
|
| |
Reviewed-by: Frans Englich
(cherry picked from commit 99b10b64fd5f68c63e0c406558b507e429eea248)
|
|
|
|
|
|
|
|
|
| |
QScriptDeclarativeClass.
Task-number: QTBUG-6178
Reviewed-by: Kent Hansen
Reviewed-by: Aaron Kennedy
(cherry picked from commit 31cc1b382fbcd77def12cd0ad4fe9fc0fabdf60b)
|
|
|
|
|
|
|
|
|
| |
Forgot to port the fix over to sqlite2 which seems to also be affected
by the setForwardOnly caching bug as well.
Task-number: QTBUG-6421
Reviewed-by: Justin McPherson
(cherry picked from commit 8d76de98d93421395306941e59d136f1e7395d15)
|
|
|
|
|
| |
Reviewed-by: TrustMe
(cherry picked from commit 60d27f4b9fd2dbed204260334b817ce41788cb3e)
|
|
|
|
|
| |
Reviewed-by: axis
(cherry picked from commit e2f2765b52508515874edea7015c01eb95ff89be)
|
|
|
|
|
|
|
|
| |
"run" target no longer is just for running emulator targets.
Also added TRK for optional requirements.
Reviewed-by: axis
(cherry picked from commit 1ae7c8d8f549cadda4780835d85235085cc5583c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added an optional timeout to runonphone - the application will be killed
after this time. Used when autotesting unattended, as some tests can hang.
Handled the just in time debug halting the application when it is about
to crash, by terminating the application. In future, we could capture a
call stack or something here.
Also added quiet/verbose options to control the amount of output from
runonphone.
Reviewed-by: Janne Koskinen
(cherry picked from commit 0e94349de0b602f1b6af747b66ef03b22133cc3a)
|
|
|
|
|
|
|
|
|
|
|
| |
Removed the alternate implementation of the registry reading, although
the new API is simpler, the old XP method is not deprecated.
Added an extra library that is needed according to API documentation,
but is omittable on MinGW.
Also gave a better error message when serial port detection fails.
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 32419380bdd11e7db401fd37a840e0ec4f5b6845)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In preparation for future removal of Webkit from Qt, Qt.sis no longer
contains QtWebkit.dll. All projects that have webkit dependency now
automatically also add dependency qtwebkit.sis into their .pkg files.
To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore
directory.
Task-number: QTBUG-6841
Reviewed-by: Simon Hausmann
Reviewed-by: Janne Koskinen
(cherry picked from commit 337931b28cb1157512ae2b6ab67ceaaf63bf1e48)
|
|
|
|
|
|
| |
Task-number: QTBUG-6162
Reviewed-by: TrustMe
(cherry picked from commit 1f8fa41e78b4174ab64953dd80a1d562b0afc5aa)
|
|
|
|
|
|
|
|
|
|
| |
This is purely an optimization for fullscreen-only apps.
Task: QTBUG-6098
RevBy: Jason Barron
RevBy: mread
AutoTest: Included
(cherry picked from commit 4a84b272459160780529f654e6aee3abf8569b51)
|
|
|
|
|
|
|
|
|
|
| |
Symbian.
QS60PaintEngine returned wrong device in QPaintEngine::paintDevice().
Task-number: QTBUG-5870
Reviewed-by: Jason Barron
(cherry picked from commit 4378b168ad289e1acbde9580b750ce04b51260c3)
|
|
|
|
|
|
|
|
|
| |
* Consistently capitalize error sentences
* Simplify & fix code/documentation.
Task-number: QTBUG-4994
Reviewed-by: TrustMe
(cherry picked from commit db782f7ab22241d8161190b95c41af4d56c05b82)
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the mediaplayer receives a state change into the ErrorState, it
calls pause() on the media object. Previously, this caused the
backend to transition into PausedState. When the mediaplayer subsequently
called errorString() to retrieve the error message, an empty string was
returned because the backend was no longer in the ErrorState.
Task-number: QTBUG-4994
Reviewed-by: trustme
(cherry picked from commit dfa9343cc1e634eebdb0f3a2cf931ada9829ae6b)
|
|
|
|
|
|
|
|
|
|
|
| |
Note that changing Utils from a namespace into a class, and then
using Q_DECLARE_TR_FUNCTIONS in the class declaration, was necessary
in order to be able to call tr(...) from the implementation of
Utils::symbianErrorToString.
Task-number: QTBUG-4994
Reviewed-by: Oswald Buddenhagen
(cherry picked from commit 3ed427637dd76da371174e14b0f7f2a15801fcac)
|
|
|
|
|
|
| |
Task-number: QTBUG-4879
Reviewed-by: Shane Kearns
(cherry picked from commit 784374ac949ecf2fdc6895908e1e4dfe938931b8)
|
|
|
|
|
|
| |
Task: http://bugreports.qt.nokia.com/browse/QTBUG-6303
Reviewed-by: Samuel
(cherry picked from commit 1484008e831a6b18272babb17992c4de686da045)
|
|
|
|
|
|
|
|
|
|
|
| |
native border."
This reverts commit 6e90192b599cee9b903177a0978198326f667613.
his change the behaviour a little bit. It is better to wait for Qt 4.7
Reviewed-by: jbache
(cherry picked from commit 092f2014cf81d9f58670ede7d381022dd6903cbb)
|
|
|
|
| |
(cherry picked from commit 547e117e7463db85651d910d5a627806388b9afc)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QSet is a hash internally, using Iterator::begin while erasing elements
inside the set might create holes and then the complexity increase.
We now use the return value of erase (the next element) so the
complexity is linear.
For those who create/delete item in the polish event (BAD), _q_polishItem
might be slower than the normal call.
Task-number:QTBUG-6958
Reviewed-by:olivier
(cherry picked from commit 6026436f0de6020252410c021e0745a22599b159)
|
|
|
|
|
|
| |
Task-number: QTBUG-7161
Reviewed-by: Daniel Pope
(cherry picked from commit 80e6ea3e871fa9f0e5a21d48ad893d4ec59c5c1c)
|
|
|
|
|
|
|
|
|
|
|
|
| |
We don't add new public methods in patch releases.
This reverts commit 2b4d3391fd922dfc5ac28815bbd5f36c4041b658.
This patch also fixes the paint engine to use glUniformMatrix3fv
directly now it has been removed from 4.6. It is a 3 line change.
Reviewed-By: Samuel
(cherry picked from commit b1327abb777ff3ee7ae32690442ca1250f536054)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When we're rendering text, the glyphs need to be aligned to the
pixel grid otherwise we get strange artifacts. Normally text is
drawn at integer coordinates, however it is still possible to
have a transform which translates by a non-integer offset. This
patch adds a flag to the engine which can be used to snap any
translate to the pixel grid.
Task-number: QTBUG-7094
Reviewed-By: Kim
(cherry picked from commit 1e7922262c29ba29a70226cf8894645f46df3ca2)
|
|
|
|
|
| |
Task-number: QTBUG-7118
(cherry picked from commit c08789f4540ac934ac4a20feaac205837fb0cf6f)
|
|
|
|
|
|
|
|
|
|
|
| |
When calling heightforWidth after a geometry change, the width actually used
could be outside the widget's width bounds. The height could then be smaller
than needed to fit the widget's contents resulting in a clipped widget being
drawn. Auto-test included.
Reviewed-by: Olivier
Task-number: QTBUG-7103
(cherry picked from commit 94759a0ed565b21c8dbfb4b12bfe6064f156b410)
|
|
|
|
|
| |
Task-number: QTBUG-7092
(cherry picked from commit 0e4c54809a8195a199d85b143e042b0f5e53fb4c)
|
|
|
|
|
|
|
|
| |
QX11PixmapData::transformed initializes a new QX11PixmapData object but
doesn't set its serial number.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit eb94abb952114e826e02ba4562d9048e77f46644)
|
|
|
|
|
|
| |
Task-number: QTBUG-7051
Reviewed-by: Daniel Pope
(cherry picked from commit fbccab463a8bd77d66adb9f96a67037f73f0019d)
|
|
|
|
|
|
| |
Task-number: QTBUG-7047
Reviewed-by: Benjamin Poulain
(cherry picked from commit 51c4571caf5d5ffb2545106df47d7c399b3e228b)
|
|
|
|
|
|
| |
Task-number: QTBUG-7015
Reviewed-by: Daniel Pope
(cherry picked from commit b0e7ef2aa62a123b51920b8f0a08af07a9cd9d09)
|
|
|
|
|
| |
Task-number: QTBUG-6992
(cherry picked from commit 049f65b4d07587e26c69602e6e59682e82948bd2)
|
|
|
|
|
|
|
|
|
| |
Calling metric() to get the device height in mm of a pixmap when using
the raster engine would actually return the width..
Task-number: QTBUG-6985
Reviewed-by: Carlos Duclos
(cherry picked from commit 4bd7e6930fcd9e04696aa5426691cd90ba383a32)
|
|
|
|
|
| |
Task-number: QTBUG-6978
(cherry picked from commit fee4ec0c8f507fae4f6795f43dca1333f46c9922)
|
|
|
|
|
|
|
|
|
|
|
| |
The problem was that when the background cache was invalidated, it was
entirely recreated but only the exposed area of the view was repainted
in it, causing the cache to be partly empty in some cases. Now the
background cache is always fully repainted when it is invalidated.
Task-number: QTBUG-6935
Reviewed-by: ogoffart
(cherry picked from commit 2600fd42117913b427d07e510724b0ea5e355205)
|
|
|
|
|
|
|
| |
The root state of a QStateMachine is now the state machine itself.
Task-number: QTBUG-6907
(cherry picked from commit 553e0cafa578ece64c07afa11571eca4c7b9444c)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Happens for example if a DockWidget is undocked and has a child
whith the WA_StaticContents attribute.
The parent does not change (so newParent is false) but still, the
top level widget change. So staticWidget need to be moved to the
new backingstore.
Reviewed-by: Benjamin Poulain
Task-number: QTBUG-6883
(cherry picked from commit 03baad51d584778a99f4b393232ccc1312db3391)
|
|
|
|
|
|
| |
Task-number: QTBUG-6870
Reviewed-by: Lorn Potter
(cherry picked from commit f019f3cf807e3c804bba3ef5598ea69adbb39e8b)
|
|
|
|
|
| |
Task-number: QTBUG-6810
(cherry picked from commit 190f45bcc7383bdc68a904e7dd5780372d00afba)
|
|
|
|
|
| |
Task-number: QTBUG-6769
(cherry picked from commit 94c2fce09c34b629a6fcb5a9576c4646a1ac24a8)
|
|
|
|
|
| |
Task-number: QTBUG-6637
(cherry picked from commit 9cdeb6ca14713891a14f24e97adb59b0d3b682fd)
|
|
|
|
|
| |
Task-number: QTBUG-6615
(cherry picked from commit 9bb45b19789910aff5e2a972a1ced758814fac31)
|
|
|
|
|
|
|
|
| |
This is needed for the fix for QTBUG-5749 that follow
Reviewed-by: Kent Hansen
Task-number: QTBUG-5749
(cherry picked from commit d14ac9914753220e54f3b5cd94d122325d499776)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Usefull if we have 'native' properties with setter in a prototype
This happen if you use a QObject wrapper as a prototype.
Use getPropertyDescriptor that look up the prototype in order to
know if we have a setter.
Note that we cannot relly on PropertDescriptor::isAccessorDescriptor
as the Getter or Setter attributes are not necesserly updated correctly
when updating properties. (See the workaround QScriptValuePrivate::propertyFlags,
and tst_QScriptValue::getSetProperty with object7)
Task-number: QTBUG-5749 (also need the previous patch)
Reviewed-by: Kent Hansen
(cherry picked from commit e715a7f4cfad454b9c966fa2938cbe9a92ce49fb)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fall back and use the GL 1 engine for the renderText() functions.
Getting it to work with the GL 2 engine is a futile effort.
Making it work with renderPixmap() in the GL 2 engine is not possible
at all, since software contexts in general do not support shader
programs.
Task-number: QTBUG-5002, QTBUG-6931
Reviewed-by: Kim
(cherry picked from commit 5394052c422f7087263ad6dc6d6a4448b4c4afba)
|
|
|
|
|
| |
Task-number: QTBUG-6474
(cherry picked from commit e8b3defc466fff9110ee00b6e730d405cde52abc)
|
|
|
|
|
| |
Task-number: QTBUG-5046
(cherry picked from commit 65a0c8cc6d2c13cfb2cef22e8a23f4e3050fde25)
|