| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Symbian^3 build of qt.sis is not compatible with pre-Symbian^3
devices, so remove the platform dependencies to said devices.
Task-number: QTBUG-17150
Reviewed-by: Janne Koskinen
(cherry picked from commit cf2f23225414893a7b061fadbde4739165f0c554)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
in the unix code, if the QMutexPrivate::wait() with a timeout
expires in the same moment that the mutex is released, wakeup
would be set, but would be then ignored. (reset to false
quickly after)
If we waken up between the timeout and the re-aquisition of
the internal mutex, we consider that the mutex has been locked.
Reviewed-by: brad
Task-number: QTBUG-16115
(cherry picked from commit 7987d4cfd3ce86c20a55b5661a5221f12246b27e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
An internal bug report suggests that we unconditionally dereference the backend
pointer in QNetworkReplyImpl when checking for the synchronity of the
originating request. The dereferencing code was introduced in commit
ad1e82323225e996720136e8b2d669166b8d8441. Unfortunately the report does not
detail where/how the crash happened, but it appears plausible that the backend
pointer became null, and the surrounding code that has extra checks suggests
this, too. In an attempt of defensive programming this patch introduces
the missing check in the reported line 112 as well as in other places
where it seems appropriate.
Reviewed-by: Peter Hartmann
(cherry picked from commit bdf3782b40b0fc2ebfda960be08c90b549cfd970)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the engine is destroyed before the program, the program
must be invalidated; otherwise the program destructor will
access a stale engine pointer, which can cause a crash
(it crashes on Symbian, but "only" gives a Valgrind warning
on Linux for our autotests).
We need to keep track of all associated programs, just like
we already do for values and strings. This fix follows the
exact same pattern, but uses a QSet to keep the patch minimal.
No new tests, but the evaluateProgram() test runs successfully
on Symbian now, and there are no more Valgrind warnings.
Task-number: QTBUG-16987
Reviewed-by: Olivier Goffart
(cherry picked from commit b127b1036ec75c625920a6c029b64a95e3702bf9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This used the orientation control QWidget attributes API from
maemo5, and provides a simple implementation for Symbian.
The essense of the implementation is that the latest setting
of one of these QWidget orientation attributes will set the
orientation for the whole app. Testing the attributes will return
only the last attribute set, it will not return the app orientation
state.
A new task, QTBUG-16972, has been created to provide a more
comprehensive implementation in the future. This may provide a more
effective emulation of the maemo5 behaviour, or may incorporate
further reaching concepts for QML rotations.
Task-number: QTBUG-11785
Reviewed-by: Shane Kearns
(cherry picked from commit e0489b905d6a31c7a904ca2b62a1e60cd12dba4f)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If application orientation has been locked to landscape and application
is started out while device orientation is portrait, QS60Style draws
the QPalette::background like device would be in landscape. Style
is incorrectly following device orientation, when it should follow
application orientation.
As a fix, style follows now application orientation. As a bonus,
unnecessary fullscreen QPixmap creation is avoided when rotating the
device.
Task-number: QTBUG-16816
Reviewed-by: Jani Hautakangas
(cherry picked from commit 54313b3ba81c276cf06c40c2420b1ff1f30e64c3)
|
|
|
|
| |
(cherry picked from commit cb38007cd3b253fb2e3a8587ae9e64080e707a31)
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit 0ba1b4d0 introduced a regression to QTextDocument: it postponed
cursor position adjustment until the move operation is done, but
contentsChanged will be triggered by finishEdit() in this move
operation, thus cursor positions in this signal handler will be in
inconsistent states (normally we should first update cursor position
then trigger contentsChanged). In this case we should also postpone
finishEdit() handling after cursor positions have been adjusted, then
the states expose to applications will be consistent.
Task-number: QTBUG-15857
Reviewed-by: Eskil
(cherry picked from commit 34c297faca93e1286573b2a01127e4e7af00aff2)
|
|
|
|
|
|
|
|
|
| |
Applied patch supplied in QT-4426, which also completes
https://bugs.webkit.org/show_bug.cgi?id=36818
Task-number: QT-4426
Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
(cherry picked from commit 14e7c8bf3982d05f6fc5c744ebbad791db6ab191)
|
|
|
|
|
|
|
|
|
| |
no need to extract the realm from the user; with digest authentication
the realm is an attribute of its own.
Reviewed-by: Markus Goetz
Task-number: QTBUG-15070
(cherry picked from commit 1137379e98cab8cc67fac70b31c97001c4473eb0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QTBUG-6611 implemented the long awaited app font support on Symbian. One
of the problems with the underlying Symbian Api for font loading is that
all fonts go into one system wide font store on fbserv. All fonts are
visible to and accessible by every application. And there is no way to
find out if a font is an app font and whose process' app font it is. If
a font with a certain family name is already loaded on fbserv, no other
application can load its font with the same family name. If two
applications access the same font, bad things can happen (details:
QTBUG-16514).
This patch works around naming collisions on the fbserv. It also
prevents Qt applications from using other Qt applications' app fonts. It
does so by "marking" the name of the temporary ttf file before the file
gets loaded by fbserv. All font name strings in the font's 'name' table
get a marker string appended. The marker is composed by a "Q", the uid3,
and on Symbian^3|PR1&below the pid. The marker length is four characters.
When the QFontDatabase is populated, all own app font names are cleand
from the marker, so that the Qt app can use the original font name. Other
applications' app fonts are detected and filtered out of the own font
database.
Symbian's font Api supports only 24 characters as names for font
families. The name marker reduces the effective characters to 20. The
reduced name length is documented for
QFontDatabase::addApplication[FontFromData] as a note.
Since the app font feature is much safer now, it got re-enabled for
Symbian^1 and below by reverting
25ac59fcf1bb03c9af9a2c967218c96c7c77361a .
Task-number: QTBUG-16514
(cherry picked from commit cfb7c16d738993fc8a594361f4bdf10e24fa754a)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
| |
We positioned the view beyond the bounds, which in some cases resulted
in only one item being created. Combined with a bug in the bounds
fixup very many items were created.
Task-number: QT-4441
Reviewed-by: Michael Brasser
(cherry picked from commit c3dd455b03a6c03011e2446f69fc262230e91639)
|
|
|
|
|
|
| |
Task-number: QTBUG-16769
Reviewed-by: Bea Lam
(cherry picked from commit 7ddec9f3179bfd854ae53e23ab292de1f9a26377)
|
|
|
|
|
| |
Task-number: QTBUG-16526
(cherry picked from commit 4f9c026a02c2ecf0d19e7aee4ecae82e64cbaee8)
|
|
|
|
|
|
|
|
|
| |
When animating pointSize avoid generating a huge number of fonts with
slightly different point sizes.
Task-number: QTBUG-13960
Reviewed-by: Aaron Kennedy
(cherry picked from commit f111e97adf93a933351eb5658b33a5820097757a)
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768.
QTBUG-16796 reports that this commit is causing regressions
relating to initial sizing of items.
Task-number: QTBUG-16796
(cherry picked from commit 8c3086aa36b51a9731fce8eb8146b33ab8196aed)
|
|
|
|
|
|
|
|
|
|
|
| |
Change d281cea3a445aa244901decceffd7d653ed829c8 caused build failure,
due to missing comma (one line missing from commit).
Fixed by adding the missing change.
Task-number: QT-4079
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 19b6e2b944a0d1eeef0fb707a00f567e4ee870e6)
|
|
|
|
|
|
|
|
| |
Add pixelmetrics data for QS60Style to support VGA screensizes.
Task-number: QT-4079
Reviewed-by: Miikka Heikkinen
(cherry picked from commit d281cea3a445aa244901decceffd7d653ed829c8)
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
| |
We failed to reset textWidth before calculating the ideal width of
the text.
Task-number: QTBUG-16710
Reviewed-by: Michael Brasser
(cherry picked from commit b481399c1c02a945e816f9385070883a0d795455)
|
|
|
|
|
|
|
|
|
| |
Protect #include of feature-specific header in #ifdef.
Task-number: QTBUG-16652
Reviewed-by: Trust Me
Acked-by: Jani Hautakangas
(cherry picked from commit a2ebd9e3f84fb8fcd2be45e91a7c71f146961e23)
|
|
|
|
|
|
|
|
|
|
|
|
| |
read http://bugreports.qt.nokia.com/browse/QTBUG-16514 for
a recipy to reboot the phone just by handling with fonts.
Symbian^1 is vulnerable, and Symbain^3 prevents a phone reboot.
Therefore, I prefer to disable the app font feature for
Symbian^1, until QTBUG-16514 us properly handled.
Task-Number: QTBUG-16514
(cherry picked from commit 25ac59fcf1bb03c9af9a2c967218c96c7c77361a)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch finally implements the missing application font support on
Symbian. QFontDatabase's addApplicationFont[FromData],
applicationFontFamilies and removeApplicationFont are now functional and
allow an application to load, use and unload fonts at run-time.
The underlying Symbian API comes with some restrictions/specialties.
Most of them are worked around in this patch, the missing ones are left
as part of QTBUG-16514:
- The font file must be a file, not a memory buffer. Web fonts and qrc
fonts come as memory buffers. These buffers are saved to a temporary
.ttf file and the file is loaded by the underlying Symbian API. The
temporary file can only be deleted after the font is unloaded.
- The font file must be in a public location in order to be loadable by
Symbian. It can for example not reside in the private application
directory. Therefore, all application fonts (also those that are on the
file system) become a temporary .ttf file in c:\temp\.
- Symbian3/PR2 will come with a font table API which provides direct
access to font tables. Symbian3/PR1 and below are missing this API,
therefore, an own TFontStore is (ab)used to read font tables out of a
font. This patch is considering both code paths in several occasions,
making the Qt Symbian font implementation significantly less
maintainable.
- The fonts are loaded into Symbian's central font server. Loaded fonts
from different processes can have colliding font typeface names (not
file names) on that server. The server does not separate loaded fonts by
their origin processes. Working around such collisions is part of
QTBUG-16514.
The number of fonts loadable at the same time by a Qt application is
limited to the random value 5. Just to prevent abuse of the font
server's memory.
As usual, this patch was looked at by colleagues, and it was adjusted
according to the feedback. But since the bus factor for the
interaction of Qt's and Symbian's font systems is 1, I reviewed this
patch, myself.
Task-Number: QTBUG-6611
Autotest: tst_QFontDatabase::addAppFont
(cherry picked from commit 770fb729929764a1f1c5fbd3d54714cf811c81e0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The bug has been around for a while, but change 604c51f1fc5c7 made it
emerge.
The problem was that stretches were combined by always *maxing* them.
The values of 'stretch' can be interpreted as this:
-1: (the default) it means that the items should be stretched with
the stretch factor dervived from the size hints. (In practice this
means that they are distributed fairly).
0: Means that the item should not be stretched
>0: Means that the item should be stretch with that number as a factor.
This meant that combining one item with a fixed size(0) and another
item with a default stretch (-1) the combined row stretch would end
up being fixed.
This also fixes how stretches are combined for spanning items too.
Task-number: QTBUG-13551
Reviewed-by: John Tapsell
(cherry picked from commit 7fbf1829e11504eca6a55f1e5dbddf2f658b5302)
|
|
|
|
|
| |
Task-Number: QT-4378
(cherry picked from commit 1de7a573c1f407d5126cf6ee1e25b4f92cbdda3c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of each QNetworkAccessManager owning a QNetworkSession, they now
share a QNetworkSession if they have the same QNetworkConfiguration.
QNetworkAccessManager now uses passive roaming instead of application
level roaming. The state change signal (entering connected state) is used
to indicate reconnection instead of being triggered when sending an ALR
accept().
This preserves the previous behaviour, as QNAM always accepted the
suggested access point from bearer mobility.
In the case of multithreaded applications, one QNetworkSession will be
created for each thread which uses QNetworkAccessManager, as QNetworkSession
is not thread safe.
Task-number: QT-4378
Reviewed-by: Markus Goetz
Reviewed-by: juhvu
(cherry picked from commit ec4b73992eb7fb7254bb7a1524b8691ef2123b9f)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QImage::converToFormat(format) won't detach QImage if
format stays the same. Because of this, internal QImage
buffer of QVGPixmapData was not deep copied. Drawing
to QPixmap target modified the original QImage that was
used to create QPixmap and in some cases crashed because
paint engine referred to wrong target.
Task-number: QT-4407
Reviewed-by: Jason Barron
(cherry picked from commit b928bab9dde43cf3acace6dfae0ae6a4f6649650)
|
|
|
|
|
| |
Task-number: QTBUG-16131
(cherry picked from commit 3526db3b8832c357b368014e6c8ebab63d4071da)
|
|
|
|
|
|
|
|
|
|
|
| |
When an app is in the background and creates a window with softkeys,
the softkeys are not updated when the app comes to the foreground, so
they look faded. This change updates the softkeys when the app comes
to the forground.
Task-number: QTBUG-16110
Reviewed-by: Jason Barron
(cherry picked from commit 37faa3ba7c66d14e1ecbf75e93d9f0d27fa57a76)
|
|
|
|
|
|
|
|
|
|
|
| |
The variable m_inlinePosition was not updated when m_preeditString
was cleared in QCoeFepInputContext. This resulted in cursor displaying
up one character beyond where it logically should have been when
using HW Qwerty keyboard on E7 and similar devices.
Task-number: QTBUG-16238
Reviewed-by: axis
(cherry picked from commit 81351f2c6f9a939e4c34cb3be6280d396c21941f)
|
|
|
|
|
|
|
|
|
| |
Fix an issue where the double click would be
triggered even with different mouse buttons.
Task-number: QTBUG-8222
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 4ea4bcc2ddea6fc6899c14bb50b22f58b51bf7ca)
|
|
|
|
|
|
|
|
| |
See 8ffb49a4ac68b1c243b25343053e6e99f97ec2e7
Task-number: QTBUG-16374
Reviewed-by: TrustMe
(cherry picked from commit 46ede046a34c822c612c55fdb1dc93dffe3fc6b6)
|
|
|
|
| |
(cherry picked from commit deef2cb5e01b871008b08b81691ad4a46deca328)
|
|
|
|
| |
(cherry picked from commit 3c5eb8766e73c855782552f7c6472801e8ae820c)
|
|
|
|
| |
(cherry picked from commit 8eab49de0548363b18c6e2c7b4ff4a8b722992d6)
|
|
|
|
|
|
|
|
|
|
|
| |
QSystemSemaphore native RSemaphore handle was unnecessarily created
again on each acquire. The creation logic was also susceptible for
random failures when two or more threads tried simultaneously acquire
the semaphore.
Task-number: QTBUG-16615
Reviewed-by: Janne Koskinen
(cherry picked from commit 570e7b38487455d394b5b74a59edc639f3dc416f)
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
| |
Currently Symbian doesn't support semi-transparent EGL surfaces.
WA_TranslucentBackground attribute is ineffective if set after EGL
surface creation. To enable translucency in this case we need to
recreate backing store to get raster surface which supports translucency.
Task-number: QT-4416
Reviewed-by: Jason Barron
(cherry picked from commit d62e9f4a6fe199ae790b1561fd4ba9ea84bd4d1e)
|
|
|
|
|
|
|
|
|
| |
Solution is to round adjustment offsets to integer values to prevent
blurry text.
Task-number: QTBUG-16240
Reviewed-by: Alessandro Portale
(cherry picked from commit e0ed2387bc818f11b16460b0150d4ea75bcf37d6)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The timer handle was only being closed when a timer was cancelled,
which resulted in a leak for one shot timers that have completed normally.
Instead the timer is now closed in a destructor (closing null handles is
safe, so it doesn't matter if the handle was never created - e.g. in the
case of a zero timer)
Also added a handle check before creating a timer to prevent a leak in
case the start function is called twice in the backend.
Task-number: QTBUG-16380
Reviewed-by: mread
(cherry picked from commit 2b1b617664bfc78f6e95e53dc0f9749bd1f2d27a)
|
|
|
|
|
|
|
|
|
|
| |
We should check not just p but also n in next()/previous(),
which is what isValid() does. Otherwise n == 0 will cause
crash in QFragmentMap.
Task-number: QTBUG-16279
Reviewed-by: Eskil
(cherry picked from commit 64852122ba71bbb297b4f1e440f6fabee16ca2fe)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change 532115bcaa370af827a5cbad017b272842c5aacf introduced a regression
by fixing a typo in the QT_OPENGL_ES_2 macro. This caused a broken
and untested code path to be used in the GLES2 case. Since the QImage
scanlines are 32 bit aligned, QImage::width() cannot be used when
copying the data. Rather than pass in bytesPerLine() to the GL function,
I opted to revert to the proven behavior, where the pad bytes are never
read by GL but each scanline is copied separately, to avoid further
regressions on different hardware. This also seems like the more correct
approach, as the pad bytes should ideally not be copied into the cache
texture.
Reviewed-by: Samuel
(cherry picked from commit 7a54885b1df9baf793374e3cb9fdf8be93ee7c80)
|
|
|
|
|
| |
Task-number: QTBUG-16319
Reviewed-by: Martin Jones
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
CLucene: Use the right delete operator.
Examples: Fix compilation with namespace.
fix build with QT_NO_BEARERMANAGEMENT
|
| |
| |
| |
| |
| |
| |
| |
| | |
start() is only defined when using bearer management; that method calls
open(), which we just call directly if not using bearer.
Reviewed-by: Markus Goetz
Task-number: QTBUG-16477
|