| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
(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)
|
|
|
|
|
|
| |
jsc-for-qtscript-4.6-staging-05102009 ( ed678069ebd06579a26b4fb8cc944f06d6b0d55c )
(cherry picked from commit 3e574dc0d1b7b2ac351bdf077b86979c85de7972)
|
|
|
|
|
|
|
|
|
|
|
|
| |
When running the Basic Drawing example with the GL2 paint engine and
antialiasing enabled, textures looked noisy. When antialiasing was
enabled, the example translated the painter half a pixel to get sharp
lines. This caused the textures to be sampled at texel corners. Without
linear interpolation, sampling textures at texel corners is
unpredictable. The fix is to not translate the painter.
Reviewed-by: Gunnar
(cherry picked from commit 30f413b74f883f7e3984dfe39d825aa6c5f16132)
|
|
|
|
|
|
|
|
|
|
| |
QTextControl showed inconsistent behaviour with DeleteEndOfWord and
DeleteStartOfWord when the cursor had a selection. With this patch,
the commands will simply delete the existing selection, which is
consistent behaviour with in other IDEs.
Reviewed-by: Simon Hausmann
(cherry picked from commit 6ce698050bbe9a4ec5198f1e08b94d51b8a6c9bd)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The default cache_limit in different platforms have different value.
For example in Symbian the default is currently 1024 KB where as for
desktop platforms the default is 10 MB.
The purpose of modified qpixmapcache test cases was to do operations
until cache_limit was reached. This was achieved by hard coded 40000
iterations. However this hard-coded value is fargile for cache limit
changes, and in addition it unnecessarily made the test exectuion to
take very long time on platforms which had smaller cache limit.
This patch changes the test so that number of expected items to fit
in cache is calculated and then 1000 extra items is tried to put
in cache to make sure limit is exceeded.
Reviewed-by: Alexis Menard
(cherry picked from commit bfe0e5c0d47780542b174dc96973920fba11c451)
|
|
|
|
| |
(cherry picked from commit b73f1b3d88927b0c51c0624f67695cfd80167d38)
|
|
|
|
|
|
|
|
|
| |
There is no reason for it, since they will never overlap.
Left a little space between numbers in case of patch releases.
RevBy: Iain
(cherry picked from commit 19a6d4245ca152758d8dbc7f7d9ee0f0654c04f7)
|
|
|
|
|
|
|
|
| |
The test tst_QListView::task254449_draggingItemToNegativeCoordinates was failing
in cocoa because of this. (on, cocoa, the call to show was doing the first paintEvent)
Reviewed-by: Thierry
(cherry picked from commit e1fbf1e016cbbf203964f3606ee2a34afe33bbd7)
|
|
|
|
|
| |
Reviewed-by: Bjoern Erik Nilsen
(cherry picked from commit 0ae8f0b63e6705790ad0bdb0f90644b557b5ac67)
|
|
|
|
|
|
|
| |
jsc-for-qtscript-4.6-staging-05102009 ( 38c2b17366f24220d9ae0456a7cfe2ac78a9f91c )
Adapt src/script to src/3rdparty/javascriptcore changes
(cherry picked from commit 502c7d324141fb48a902ef475b4fd2932dc859c5)
|
|
|
|
| |
(cherry picked from commit b2ea3433f4a42e367fd0708f0198329754903086)
|
|
|
|
| |
(cherry picked from commit 491a9879d349a67dbd5f00f1c0bb189fb92290e3)
|
|
|
|
|
| |
Reviewed-by: Samuel
(cherry picked from commit 7cb0dea6d991a4d9f4a66b699dc5b353812b168d)
|
|
|
|
|
| |
Reviewed-by: Gunnar
(cherry picked from commit c1d24c6b87dcc4c6e2f6f258c0198fdb6b2795f0)
|
|
|
|
|
| |
Rubber-stamped by: Simon Hausmann
(cherry picked from commit 5286a0211d9c76bf762c8041c1d596d8c9c9c08d)
|
|
|
|
|
|
| |
Merge-request: 1541
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
(cherry picked from commit b0e6c5ca48c76fb17dca986e9e07adebde390e29)
|
|
|
|
|
|
|
|
|
|
|
| |
In libtiff 4.0, TIFF_VERSION has been replaced with
TIFF_VERSION_CLASSIC (to indicate normal tiff support)
and
TIFF_VERSION_BIG (to indicate BigTIFF support)
Merge-request: 1547
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
(cherry picked from commit 7ec805adeecb8d518c0eb01dad1c04ccea78b340)
|
|
|
|
|
|
|
|
| |
This allows the animations to work with the newly integrated dynamic
metaobject
Reviewed-by: Michael Brasser
(cherry picked from commit e548c48513546199c848e6cb08a60e8eccdab2c5)
|
|
|
|
|
| |
Reviewed-by: alexis
(cherry picked from commit 32a9237c49fd126bee0cbe02c3c5bff5145a6e21)
|
|
|
|
|
|
| |
Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
Merge-Request: 1657
(cherry picked from commit 429c7c6760c100685e9800b89fca7f0afd2d8abc)
|
|
|
|
|
|
|
|
|
|
| |
It also invokes the destructor directly, even on forward-declared types.
That must be an ABI convention.
This test isn't reliable.
Reviewed-by: TrustMe
(cherry picked from commit 1d01065f3c88701eeed8018c2125b0170d057b52)
|
|
|
|
|
|
|
|
| |
The device can't cope, so let's keep only the small thread count tests
there.
Reviewed-by: Trust Me
(cherry picked from commit c5352705d933e76df6d40f01a5e6803bc4106b93)
|
|
|
|
|
|
|
|
|
|
| |
It was decided on weekly telco that Symbian pkg and sis files can use
plain Qt name, since it is already clear that user is installing
"Qt for Symbian" version of Qt.
Task-number: QT-772
Reviewed-by: Miikka Heikkinen
(cherry picked from commit a3ef6e080980e242dd7703c48a628ad821549991)
|
|
|
|
|
| |
Reviewed-by: Trond
(cherry picked from commit a3e74ba189475d606f2a7a07f52591fd312a45c9)
|
|
|
|
|
|
|
|
|
| |
Change authored by Rhys.
Bug introduced by the change to allow user-specific cache and pipe
directories.
Reviewed-by: Jeremy
(cherry picked from commit af1d916b86295543b8e20be79abf48453d9c55d0)
|
|
|
|
|
| |
Reviewed-by:TrustMe
(cherry picked from commit 144273fe9e2280f52f1dba0b5781a54f8b459d1e)
|
|
|
|
|
|
|
|
|
|
| |
We reuse tooltip whenever we can. But we forget to check if
the format of the text changes inbetween (from html to plain).
This causes the word wrap to fail sometimes. This change will
fix that.
Rev-By:MortenS
(cherry picked from commit 80e47c92e0b4f506b2b57d0e58022903dc62ba3d)
|
|
|
|
|
|
|
|
|
|
|
|
| |
QStateMachine framework installs QObject event filters to catch events
in order to triggers the proper transition. But installing a QObject event
filter on a QGraphicsObject gives nothing because QGraphicsView events
filters works differently. In order to make this works we now post
events using QApplication::postEvent in addition to the QGraphicsView
events.
Reviewed-by:andreas
(cherry picked from commit 10dba674d366260589f3b742e5b1b87ce9ddd47c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When rendering etched text on disabled rich text labels
we would previously draw distorted links.
This is basically because anything that
did not render with the text foreground role would
be drawn twice as a shadow. Since there is no way to properly
render this text etched we will rather disable it completely
when the label uses rich text.
Task-number: QTBUG-4543
Reviewed-by: Simon Hausmann
(cherry picked from commit d1d661a1858e28befe5980c22009702f5ea82829)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Nokia X86 compiler is not able to resolve correct templated qCompare
functionfor derived types. So implicit casting does nto work corectly.
I have tried to add template specilations for qCompare also, but then
compiler complainf about unambiguous functions.
The promlem for now is fixed by adding explicit cast to same type
against which the comparuion is done.
Reviewed-by: TrustMe
(cherry picked from commit 7655e27047790d89f9af0132946ad5db5138e7bf)
|
|
|
|
|
|
|
| |
Don't add export declaration for the definition of the variable.
Reviewed-by: Gunnar
(cherry picked from commit 1aaa11708eb0f8281e6de2c4ea6f04e5d38813e0)
|
|
|
|
|
|
|
|
| |
Without this fix we got the following error:
"line 776: Error: #254: type name is not allowed"
Reviewed-by: TrustMe
(cherry picked from commit c488298d4c15fb39ef960bda19f28c9ea9b9054b)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It wasn't possible for the paint engine to override the drop
shadow filter because QPixmapDropShadowFilter::draw() was not
asking for an engine-specific filter object.
Also, change the OpenVG filter to use vgGaussianBlur() instead of
vgConvolve(), and draw the original image on top of the shadow.
Task-number: QTBUG-4583
Reviewed-by: trustme
(cherry picked from commit 3909d97e86d62fd94e149925b5f3111c8f391334)
|
|
|
|
|
|
|
|
| |
QGLShareContextScope is safer and more reliable than trying to manually
detect how and when to temporarily switch contexts. Replace the few
remaining instances of context-switching with it.
Reviewed-by: trustme
|
|
|
|
| |
Reviewed-by: trustme
|