| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
kurltest
(cherry picked from commit 65a101502bb04ea95110ce6e12a3848c790eb7a1)
|
|
|
|
|
| |
"Error: "static WTF::TCMalloc_PageHeap::runScavengerThread(void*)" is expected to return a value."
(cherry picked from commit 9225889d8958e71c8683df752ff2207c11334c9a)
|
|
|
|
|
|
| |
We are not going to fix this in 4.5. I doubt we'll fix it in 4.6
either, so I'll reenable it for 4.7 only.
(cherry picked from commit 7ed2e44c48ac625993cf33cdbb70f82b0a3cb1af)
|
|
|
|
|
|
| |
jsc-for-qtscript-4.6-staging-06102009 ( 32d226eb14d44f80e9ec96d4ca2c595181eeeca3 )
(cherry picked from commit 72f1e06aa6238f55729c4f3606d06ad7d37fe6df)
|
|
|
|
|
|
|
|
| |
In Symbian OS some timeouts needs to be higher ones, in order to
test complete correctly.
Reviewed-by: Miikka Heikkinen
(cherry picked from commit e6fdab148b207b6e0cf9279b4b82578d95f021a9)
|
|
|
|
|
|
|
|
|
|
|
| |
In Symbian OS the maximum number of thread per process depends on stack
size. With default 8KB stack size you can have 128 threads, with 16KB
stack size you can have 64 threads etc. Since all qt threads nowadays
have maximum stack size, we need to decrease the amount of threads in
this test.
Reviewed-by: TrustMe
(cherry picked from commit 56087f7ffa0c64c34f55cf24a24d9337592b6c23)
|
|
|
|
|
|
|
|
|
| |
Test fails sometimes in Symbian OS due to fact that lackey has not
finished it's task in given time. Increase timeout to same value as used
in waitForStarted statement.
Reviewed-by: TrustMe
(cherry picked from commit 501d0fc639e7ec9b26a102eac857123d86215ccf)
|
|
|
|
| |
(cherry picked from commit f1ea73bad48816222e192a95f8589493743f0c28)
|
|
|
|
|
|
|
|
|
|
| |
After we started caching the current context internally, it revealed
an old bug: when a QGLWidget is reparented under X11, it will
get a new window id, but its context will still be bound to the
old window, so we need to rebind it.
Reviewed-by: Samuel
(cherry picked from commit 6d56096ba0f88e25efd77072f58804dd1f160c0a)
|
|
|
|
|
|
| |
jsc-for-qtscript-4.6-staging-06102009 ( fc2005c87bbbb743eba96041210902fec821a1af )
(cherry picked from commit b7503346c1b7d245625b1b9e7cf7ae89a86467f0)
|
|
|
|
|
|
|
| |
Currently Windows has no proper cursor support.
Reviewed-by: Thomas Hartmann
(cherry picked from commit 1015ee9016f3a46bb05077a9eff83c8736b2541e)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit bec7a9cced7b69aef707bad4931fa4d3c35b37fa)
|
|
|
|
| |
(cherry picked from commit f18ea32865521e21f47ea2745181e0e70db0266f)
|
|
|
|
|
|
|
|
| |
The font size was not respected because it is taken from the
request which could only contains the pixel size.
Reviewed-by: Richard
(cherry picked from commit 146988463cc0d03be415aa8ff07031b6bcf27975)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is no 'this' register in the global context.
The computation of the this register for the global context
gives the 'codeBlock' register in the frame header.
On Intel processor, a JSValue() is 0x0 when converted to a pointer,
but this is not the case on PowerPC (it is 0xfffffff9) so it just
crash later when acessing the code block.
Solution: special condition for the global context when getting the
'this' object
Reviewed-by: Kent Hansen
(cherry picked from commit 37bd7a5711e57ea8c45ae75102ddee3ab905a0e5)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 0fedc2d3066a17e8062ec5271d8e53475c5cc312)
|
|
|
|
|
|
|
|
|
|
|
| |
If you reused a printer to paint to several different files, the
results would sometimes be different, as the subsequent runs would have
redundant setPen commands in its output. This was because the simplePen
flag was not reset to its initial value when reusing the print engine.
Task-number: QTBUG-4479
Reviewed-by: Trond
(cherry picked from commit 39dc3026d1da03d5fcf8e5c516fadd7e4ea8a861)
|
|
|
|
|
|
|
|
|
|
|
|
| |
On Windows mobile we usually don't have the "Times New Roman" font.
Thus we must deploy and register it, if its not available.
Reviewed-by: mauricek
(cherry picked from commit 7851cbd64d15d39a0e9cc99efa6c2d007c935ce9)
Conflicts:
tests/auto/qcssparser/qcssparser.pro
|
|
|
|
|
|
|
|
|
|
|
|
| |
We need to give Windows mobile some more time to handle all internal
timer events. Otherwise QTreeView::updateScrollBars doesn't get called.
Reviewed-by: mauricek
(cherry picked from commit b1310cb8fcc4b48750f82502a7140f2ebb8a44c7)
Conflicts:
tests/auto/qabstractitemview/tst_qabstractitemview.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QGraphicsWidget used to called setPosHelper where all the logic was.
But since the new flag itemSendsGeometryChanges some part of the code
inside setPosHelper move back to setPos. QGraphicsWidget was not updated
after this change. It doesn't matter as it is but for QGraphicsProxyWidget
which activate the flag itemSendsGeometryChanges it matters. ItemChange
was never called so the proxy was never really moved.
Task-number:QT-672
Reviewed-by:andreas
(cherry picked from commit 3da33626c056169f5fadf94f12997180cb3a08b4)
|
|
|
|
|
|
| |
Task-number: QTBUG-1087
Reviewed-by: Andreas
(cherry picked from commit 231d8d7c02161e93b3a97a1bacb3c402f16e1fcb)
|
|
|
|
|
|
|
|
|
| |
The -prefix-install option is actually on by default and has no effect
on any platform but Mac.
Task-number: QTBUG-3029
Reviewed-by: Lincoln Ramsay
(cherry picked from commit 180bdb06feed8c5fe08f88b9eb16b7676615851f)
|
|
|
|
|
| |
Reviewed-by: Bill King
(cherry picked from commit 2a18238357e3442a2e9a6eb2fe8b9ff78704c174)
|
|
|
|
|
| |
Reviewed-by: Trond
(cherry picked from commit 0a90113262eab4e05bf73c0b69b1f5633a10e768)
|
|
|
|
| |
(cherry picked from commit a5589d34ec38992d4cc58861183d58f6f20af861)
|
|
|
|
| |
(cherry picked from commit d96392b83aab8b5b9bb5e951729dba938396e28b)
|
|
|
|
| |
(cherry picked from commit 2420c3b6c728ed4c8a8efd4c93427932420c7368)
|
|
|
|
| |
(cherry picked from commit c768694764e8bc32a7152b80653eef564631452a)
|
|
|
|
|
|
| |
Task-number: QTBUG-4583
Reviewed-by: trustme
(cherry picked from commit 0bdb0d61d8eea356b1ac7d09ced6dee26d89ee8d)
|
|
|
|
|
|
|
|
|
|
|
| |
If an audio device only supported Input or Output, it would not be added
to the list of devices. Only devices that returned IOID == NULL would be
added. Also, _m was not being used, and io was unneccessarily being cast
to a QString.
Merge-request: 1664
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
(cherry picked from commit ba11343826229e983cb1d38811c8363d355e2e01)
|
|
|
|
| |
(cherry picked from commit c7b091351d6fdf5fda5f38a94af24a395252249f)
|
|
|
|
|
|
|
|
|
|
| |
abld in the S60 SDKs has a bug where OPTION_REPLACE cannot be used to
remove options from the command line (ie. replace them with nothing),
so this workaround introduces a macro definition (that should never be
used) as a harmless replacement option.
Reviewed-by: Aleksandar Sasha Babic
(cherry picked from commit 8cac1e7fe5bfda7e876d03d1407f616f89bd74f8)
|
|
|
|
|
|
|
|
|
|
| |
HAL::Get(HALData::EPen, TInt& result) may set 'result' to 1
on some 3.1 systems (e.g. N95). But we know that S60 systems
below 5.0 did not support touch. Let's use tahth knowledge
and work-around that N95 HAL bug.
Rev-By: Jani Hautakangas
(cherry picked from commit 2d0c3bd0fac50d4e9f6c2d7d5e9c2fd8eee4d599)
|
|
|
|
|
|
|
|
|
|
|
|
| |
In some cases the QImage, returned by QS60PixmapData::toImage()
image an invalid pointer. That led to reproducable crashes on 3.1
Device and Emulator when starting a drag in the FridgeMagnets
demo. Jani Hautakangas created this fix and I tested it on
3.1 Device and Emulator confirming that the crash is gone.
Rev-By: Jani Hautakangas
Rev-By: Alessandro Portale
(cherry picked from commit 064674426ef0c446561b0c338441bb7d5ca091bf)
|
|
|
|
| |
(cherry picked from commit 8dbbff1dec967d043255e8cea2c4d32be3c1f9cd)
|
|
|
|
| |
(cherry picked from commit a3fc0c3b6a45864c845e3a25640b967dd34fa6fc)
|
|
|
|
|
|
|
|
|
|
| |
QTextControl has two independent interaction flags
TextEditable and TextSelectableByKeyboard, i.e. the latter can also
apply in read-only mode. This used to be handled incorrectly
in QTextEdit.
Reviewed-by: con
(cherry picked from commit 45cd658c7dce650b12e2d0760e852ece1d8812fd)
|
|
|
|
|
|
|
|
|
|
| |
QTextControl has two independent interaction flags
TextEditable and TextSelectableByKeyboard, i.e. the latter can also
apply in read-only mode. This used to be handled incorrectly
in QPlainTextEdit.
Reviewed-by: con
(cherry picked from commit f38b88fa3d8ec4448c28044bf95c5c845a80d3f1)
|
|
|
|
|
|
|
| |
we were calling sk_pop_free from OpenSSL with a wrong signature.
Reviewed-by: Olivier Goffart
(cherry picked from commit b6313e00291a42e1e888a40b0c589ac5be497707)
|
|
|
|
| |
(cherry picked from commit c62d9f723347e448033bbb66b281b647166e89f4)
|
|
|
|
|
| |
The variable updatesEnabled is not used on Mac OS X.
(cherry picked from commit fa5f70d3c93758cd8d2c24de73b2d3dc83fb56b8)
|
|
|
|
|
| |
Reviewed-by: trustme
(cherry picked from commit 06aaf39be5cf341237f0eff85f277625ed732d7a)
|
|
|
|
|
|
| |
Task-number: QTBUG-4587
Reviewed-by: Tor Arne
(cherry picked from commit a1fa0d50f9bebc7148cd21fa3c420d2ff0fe7d12)
|
|
|
|
|
|
|
|
|
| |
Setting a pixmap brush when painting to a 32-bit target might cause the
source pixmap to be converted to 32-bit. We should detach the pixmap if
we need to convert it.
Reviewed-by: Trond
(cherry picked from commit 1210fa5b2d65895ad2be1f9ca7cae586e3b29dc1)
|
|
|
|
|
|
|
|
|
|
| |
This test already uses qWaitForWindowManager(), but on X11, reshowing
a dialog can take long as the window manager has to do more work
before remapping the window. we should give it more time (hence the
change to QTRY_VERIFY)
Reviewed-by: Rohan McGovern
(cherry picked from commit d763b9a56c5f488a6a4187f6aa454405ab75d09b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The reason for the crash was the following: When we make menu entries
in Qt, we assign each item an arbitrary command ID. This is because
Symbian usually puts the items in a resource file and refers to them
by ID, but we need to be dynamic. These command IDs are also assigned
to cascading menu items (sub menus). When we then get a callback in
RestoreMenuL with one of submenu IDs, we used to ask Symbian to
construct the menu items for them, but Symbian doesn't know about
them.
Fixed by avoiding call into S60 code if the ID belongs to Qt.
Also put a cap on the number of menu items. It's very unlikely that
anyone will reach it, but it's better to have an actual check.
Task: QT-646
AutoTest: Manual testing went fine
RevBy: mread
(cherry picked from commit c4571223a0ebb2f00a6c29477d0a4a55ae3cd2b5)
|
|
|
|
| |
(cherry picked from commit 4754ebccb9848bff1cb11caab61f58ac2f441b3c)
|
|
|
|
| |
(cherry picked from commit 5e1fcb056a42abdfd04d7ca25f55de43dfdcc648)
|
|
|
|
|
| |
RevBy: Trust me
(cherry picked from commit c6e0bf67795768954bc2ac129f20dbb7243b2975)
|
|
|
|
| |
(cherry picked from commit eda93b795b044542a4247a086e4c2eed454123e4)
|