| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
The previously used name "Nokia, Qt" was not usable for Nokia
Content Signing, which only allows "Nokia" as the visible vendor
name. The unique vendor ID remains as "Nokia, Qt"
Reviewed-by: TrustMe
(cherry picked from commit a8a84f1667966acfa093c4be0b7d4b0900ddd3d9)
|
|
|
|
|
|
|
|
|
|
| |
QtWebKit 2.0.1 was part of Qt-4.7.1, QtWebKit as included
in 4.7.2 should be 2.0.2.
Merge-request: 1095
Task-number: QTBUG-17480
Reviewed-by: Jason McDonald
(cherry picked from commit dfde84cccb14b109bebd672108a0ce0d6131361f)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When creating a substring, JSC::UStringImpl required that the
base string pointer was 8-byte aligned. However, on platforms
where FastMalloc isn't enabled (such as Symbian), it's possible
that the system malloc() returns a pointer that is only 4-byte
aligned. (On Symbian, this can happen if the argument to malloc()
itself isn't a multiple of 8.)
Cherry-picked http://trac.webkit.org/changeset/54743 from WebKit
trunk, which fixes this issue. (The commit happened shortly after
we rebased QtScript/JSC for 4.7, so it applies cleanly to our copy.)
Task-number: QTBUG-16828
Reviewed-by: Simon Hausmann
(cherry picked from commit ead20f4c1edc2e1c5c39f47bf7c9e56600d6362b)
|
|
|
|
|
|
|
|
|
|
| |
Cherry-picked from http://trac.webkit.org/changeset/56370
The old allocator caused QML to crash in MCL (TB10.1, week 1).
Task-number: QTBUG-14293
Reviewed-by: Simon Hausmann
(cherry picked from commit 86a864f906d7dcda1b1ab04d1e25e7020a53be64)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The reserved (virtual) size of the chunk is not necessarily a
multiple of the "pool" size (the physical growth increment).
The reserved size is only rounded up to a multiple of the page
size (4K), not the pool size (64K).
This meant that the commit of the _last_ part of the chunk could
(and did) fail, because we tried to commit 64K while only a size
<64K was remaining.
Detect this case and reduce the requested size accordingly.
Also add a call to CRASH() in case Commit() returns an error,
to avoid obscure crashes in JSC at a later point (grow() must
not fail).
Task-number: QTBUG-16685
Reviewed-by: Simon Hausmann
(cherry picked from commit 81941e4c5dcd18ef04b2b22dd3f1b4c04620647c)
|
|
|
|
|
|
|
|
|
| |
If both plugins are present on a device, the MMF backend is now
loaded by default.
Task-number: QT-4472
Reviewed-by: Justin McPherson
(cherry picked from commit 808de6fd2f9835c28986b86de829579196b6163d)
|
|
|
|
|
|
| |
Task-number: QTBUG-16513
Reviewed-by: Gareth Stockwell
(cherry picked from commit b58eb0419f9f724af5d9baf8bbce4e0f1e2f3f8b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Phonon API does not provide any way for the client to specify
which network connection should be used for streaming playback.
If the application already has a connection open, using a bearer
other than the default (e.g. using WiFi when the device default is
GPRS), it may be desirable to use it for streaming, rather than
allowing the Phonon backend to open a second connection on the
default bearer.
This patch adds a custom property on the Phonon::MediaObject,
called InternetAccessPointName. The client can specify the IAP
which Phonon should use by setting this property.
Note that support for this property is only provided in the Phonon
MMF backend.
Task-number: QTBUG-11436
Reviewed-by: Gareth Stockwell
(cherry picked from commit 1640acce5ca8f49c5655edffa2a1108048c5a414)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
|
|
|
| |
RevBy: Trust me
|
| |
|
| |
|
|
|
|
| |
Instead, return Features();
|
|
|
|
| |
QMetaType::Float is not a member of QVariant::Type.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a missing error-signal when a server is shut down while downloading
Ensure that if this is does not have a valid filter when on XP or less
HTTP backend: fix build without Qt3 support
QNetworkAccessManager: enable synchronous HTTP calls
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a missing error-signal when a server is shut down while downloading
Ensure that if this is does not have a valid filter when on XP or less
HTTP backend: fix build without Qt3 support
QNetworkAccessManager: enable synchronous HTTP calls
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The renderer is only supported on Windows Vista or later so if we are
on an earlier version of Windows then this should not be used. In
addition this patch also ensures that it resets the filter if any of the
needed functions fail.
Task-number: QTBUG-13062
Reviewed-by: Thierry Bastian
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (28 commits)
Fixed tst_qwidget::winIdChangeEvent
Use parent class function to generate Makefile headers in Symbian
Fix spaces
Fix QPixmap::fromImage() in the OpenVG pixmap backend.
Native color dialog on symbian
Fix non-stroked filled paths in OpenVG paint engine.
Fix symbian-mmp.conf include path
Fix a build break when namespace is defined
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
These types of events replace text that is already in the widget, but
WebKit did not check for replacementLength at all.
RevBy: Janne Koskinen
Task: QT-4303
Task: https://bugs.webkit.org/show_bug.cgi?id=49787
AutoTest: Included
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
downloadmgrclient.h is not found on S^4 baselines, causing a build
failure. This commit is a temporary workaround, which disables
progressive download support if the header is not found.
The correct solution is to determine whether the RHttpDownloadMgr
definition has moved, and if so, to modify the .pro file to
include the new path.
Task-number: QTBUG-10769
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit integrates the Download class with the media playback
classes in the backend, to implement Progressive Download.
Note that this PDL implementation has one drawback: when video
playback is paused due to shortage of data (i.e. due to the download
being temporarily stalled), the display goes black. This is because,
when the end of the currently-downloaded data is reached, the
playback session is closed. When more data becomes available, the
clip is re-opened, a seek is done to reach the previous playback
position, and playback is re-started. Closing the playback session
closes the video stack's connection to the display, thereby causing
the video widget to go black while more data is buffered.
This is a consequence of the level in the native video stack at which
the Phonon integration is done: managing a network stall without
requiring the playback session to be closed would require integration
below the MMF client API, specifically at the MMF controller level.
Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This patch adds a Download class which uses the RHttpDownloadMgr
API to download a media clip over HTTP.
Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( bbff6182e525fcf58dbc7426a1fbbf8f31588214 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-08-05 David Leong <david.leong@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Input mode states are not reset after entering a password field
https://bugs.webkit.org/show_bug.cgi?id=43530
Input mode hints are not reset if clicking on password <input> elements then
clicking on <textarea> elements
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::setInputMethodState):
* tests/qwebview/resources/input_types.html:
* tests/qwebview/tst_qwebview.cpp:
(tst_QWebView::focusInputTypes):
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The following overload was added in S^3:
TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer,
TDataRecognitionResult& aDataType) const
In order to allow the backend to compile against earlier versions
of the platform, this patch calls the RecognizeData overload which
taking the same arguments as above, plus a filename (for which
KNullDesC is passed).
Task-number: QTBUG-6562
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The backend accesses the resource file path via MediaSource::url().
A small patch to Phonon was required to enable this, because by
default, Phonon passes a QIODevice, rather than the resource file
path, to the backend.
The backend uses this path to create a QResource object, through which
the memory buffer into which the resource file has been read can be
accessed. This buffer is wrapped in a Symbian 8-bit descriptor and
passed to the OpenDesL() function of the appropriate MMF client
utility API.
Playback only works for certain file formats, as the Symbian MIME type
recognizer does not always work. For example, playback of an audio
WAV resource file works, while playback of an MP3 resource file does
not.
Task-number: QTBUG-6562
Reviewed-by: Justin McPherson
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The backend accesses the resource file path via MediaSource::url().
A small patch to Phonon was required to enable this, because by
default, Phonon passes a QIODevice, rather than the resource file
path, to the backend.
The backend uses this path to create a QResource object, through which
the memory buffer into which the resource file has been read can be
accessed. This buffer is wrapped in a Symbian 8-bit descriptor and
passed to the OpenDesL() function of the appropriate MMF client
utility API.
Task-number: QTBUG-6562
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-07-27 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Tor Arne Vestbø.
[Qt] Incorrect input method hints
https://bugs.webkit.org/show_bug.cgi?id=43037
Properly set or reset all input method hints when
activating input fields.
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::setInputMethodState):
* tests/qwebview/tst_qwebview.cpp:
(tst_QWebView::focusInputTypes): Extended unit test to verify that we
reset hints.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( 038b62085831eef4dee423361c65ecd55b7b9b1d )
Changes in WebKit/qt since the last update:
* backport: https://bugs.webkit.org/show_bug.cgi?id=30978 -- [Qt] ASSERT failure while running DRT
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
All platform includes are now lower case, i.e. '#include <foobar.h>'
rather than '#include <FooBar.h>'.
Note that Qt includes are still camel case, e.g.
'#include <QtGui/QWidget>'
Task-number: QTBUG-6528
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is to be consistent with the backends for other platforms, which
also call QWidget::winId() on the VideoWidget (or one of its children)
during construction.
Reviewed-by: Thierry Bastian
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When Phonon::MediaObject::setCurrentSource() is called when the
MediaObject is connected to a Phonon::VideoWidget, the
MMF::AbstractVideoOutput pointer is propagated inside the backend
from the first MMF::AbstractVideoPlayer to the second.
If the VideoWidget is subsquently re-sized, the code path enters
the ScaleFactors branch of the
MMF::SurfaceVideoPlayer::handleParametersChanged function. At this
point, m_displayWindow is still set to the inital null value, and the
assertion therefore fails.
This change ensures that m_displayWindow is updated before attempting
to apply the scale factor change.
Task-number: QTBUG-11377
Reviewed-by: Thierry Bastian
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Failure to Close() an existing MMF player utility object before
creating a new one - which happens in the MMF backend's implementation
of Phonon::MediaObject::setCurrentSource() - causes intialization of the
newly-created utility to fail later on.
Task-number: QTBUG-11377
Reviewed-by: Thierry Bastian
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
CVideoPlayerUtility::RegisterForVideoLoadingNotification() was only
called in the DSA, not the NGA, variant of the Phonon MMF backend.
Task-number: QTBUG-11378
Reviewed-by: Thierry Bastian
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The Phonon API allows video to be played via a Phonon::MediaObject,
even if no Phonon::VideoWidget has been connected to it. This
patch prevents the Phonon MMF backend crashing in this scenario
due to dereferencing a null pointer.
Reviewed-by: Thierry Bastian
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( fc13f9b396e1448cd71266f56ba7a93de5cf6ed9 )
Changes in WebKit/qt since the last update:
* Benjamin's update/fixes to the backport of https://bugs.webkit.org/show_bug.cgi?id=33150
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4b88f595ab62b7c5f703a286c4f5f13f8784a936
* Fix crash/regression in thai line word breaking when libthai is installed:
Commit 4b88f595ab62b7c5f703a286c4f5f13f8784a936 upstream ensures the zero
termination of the string passed to libthai.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
a80fd59e3b3b18116803a14e6369345933994236
* Disable data structure packing with RVCT, as it appears that the
compiler miscompiles the code.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
Clean up HB_Anchor's DeviceTables on failure when loading format 3
Make sure ValueRecord's DeviceTables are cleaned up on failure
Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
Prevent warnings about EPOCROOT coming out when not on symbian
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( be1a105be93d7fcbe36d93d0827dc6e98b55de0c )
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
* Import f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 which fixes a crash
with certain fonts.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Cleanup was a missing for the case where loading an X placement
device table failed.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
ab9a897b688e991a8405cf938dea9d6a2f1ac072
From Andreas Kling <andreas.kling@nokia.com>:
* Unbreak _HB_OPEN_Get_Device() and Get_ValueRecord()
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
( be1a105be93d7fcbe36d93d0827dc6e98b55de0c )
Changes in WebKit/qt since the last update:
* https://bugs.webkit.org/show_bug.cgi?id=40567 -- [Qt] QtWebKit crashes while initializing flash plugin 10.1.53.64.
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | | |
into 4.6
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Author: Andreas Kling <andreas.kling@nokia.com>
Date: Fri Jun 18 16:10:31 2010 +0200
Make HB_AnchorFormat3's Device tables a pointer array
Saves sizeof(pointer) * 1 when the font doesn't have these tables.
Cuts resident memory consumption by 40kB when loading qt.nokia.com
in QtWebKit.
Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
( a13977ce2aba31808a046cddc082a84dc316d78b )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-06-18 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Antti Koivisto.
REGRESSION(r60958) [Qt] qwebpage::inputMethods auto-test fails
https://bugs.webkit.org/show_bug.cgi?id=40830
When activating a regular input method field, always set or unset the ImhHiddenText
input method hint.
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::setInputMethodState):
|